mirrors
/
zsh
mirror of git://git.code.sf.net/p/zsh/code
1
0
Fork 0
Code Releases Activity

22831: use CM_SPACE in compdescribe

This commit is contained in:
Andrey Borzenkov 2006-10-07 08:05:03 +00:00
parent b4f837a862
commit 9d8c3eb74d
4 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2006-10-07 Andrey Borzenkov <bor@zsh.org>
* 22831: Src/Zle/comp.h, Src/Zle/compresult.c, Src/Zle/computil.c:
make CM_SPACE definition global and use it consistently in
compresults and compdescribe to lay out matches
2006-10-06 Peter Stephenson <pws@csr.com>
* 10791: Src/Zle/compresult.c: accumulated completions

4
Src/Zle/comp.h
View File

@ -407,3 +407,7 @@ struct chdata {
Cmatch cur; /* current match or NULL */
};
/* The number of columns to leave empty between rows of matches. */
#define CM_SPACE 2

4
Src/Zle/compresult.c
View File

@ -30,10 +30,6 @@
#include "complete.mdh"
#include "compresult.pro"
/* The number of columns to leave empty between rows of matches. */
#define CM_SPACE 2
/* This counts how often the list of completions was invalidated.
* Can be used to detect if we have a new list. */

17
Src/Zle/computil.c
View File

@ -33,13 +33,6 @@
/* Help for `_describe'. */
/*
* FIXME this should be defined globally. I have to find other places
* where it is used
* */
#define INTERMATCH_GAP 2
typedef struct cdset *Cdset;
typedef struct cdstr *Cdstr;
typedef struct cdrun *Cdrun;
@ -161,7 +154,7 @@ cd_group(int maxg)
for (str2 = (set2 == set1 ? str1->next : set2->strs);
str2; str2 = str2->next)
if (str2->desc && !strcmp(str1->desc, str2->desc)) {
width += INTERMATCH_GAP + str2->width;
width += CM_SPACE + str2->width;
if (width > cd_state.maxmlen || num == maxg)
break;
if (width > cd_state.maxglen)
@ -276,7 +269,7 @@ cd_prep()
cd_state.gprew = 0;
for (i = 0; i < cd_state.maxg; i++) {
cd_state.gprew += wids[i] + INTERMATCH_GAP;
cd_state.gprew += wids[i] + CM_SPACE;
}
if (cd_state.gprew > cd_state.maxmlen && cd_state.maxglen > 1)
@ -631,7 +624,7 @@ cd_get(char **params)
* max prefix length (cd_state.pre) +
* max padding (cd_state.premaxw generously :) +
* separator length (cd_state.slen) +
* inter matches gap (INTERMATCH_GAP) +
* inter matches gap (CM_SPACE) +
* max description length (cd_state.suf) +
* trailing \0
*/
@ -648,7 +641,7 @@ cd_get(char **params)
*mp++ = ztrdup(str->match);
strcpy(p, str->str);
p += str->len;
memset(p, ' ', (l = (cd_state.premaxw - str->width + INTERMATCH_GAP)));
memset(p, ' ', (l = (cd_state.premaxw - str->width + CM_SPACE)));
p += l;
strcpy(p, cd_state.sep);
p += cd_state.slen;
@ -750,7 +743,7 @@ cd_get(char **params)
}
strcpy(dbuf, cd_state.sep);
remw = columns - cd_state.gprew - cd_state.swidth - INTERMATCH_GAP;
remw = columns - cd_state.gprew - cd_state.swidth - CM_SPACE;
p = pp = dbuf + cd_state.slen;
d = str->desc;
w = MB_METASTRWIDTH(d);