diff options
author | Sven Wischnowsky <wischnow@users.sourceforge.net> | 2001-07-25 08:52:34 +0000 |
---|---|---|
committer | Sven Wischnowsky <wischnow@users.sourceforge.net> | 2001-07-25 08:52:34 +0000 |
commit | eba59194d72250402bdbb97a866ffea89ec9d7a7 (patch) | |
tree | 607dc8f64428fb9f749405c96e7c3e7969739cce /Src/Zle/complist.c | |
parent | 6d81779954a9a5ef64c87a21ce131190a1214d7c (diff) | |
download | zsh-eba59194d72250402bdbb97a866ffea89ec9d7a7.tar.gz zsh-eba59194d72250402bdbb97a866ffea89ec9d7a7.tar.xz zsh-eba59194d72250402bdbb97a866ffea89ec9d7a7.zip |
make display for groups in _describe nicer; improve packing with list_packed; leave space for type character (list_types) only in groups with at least one file name (15477)
Diffstat (limited to 'Src/Zle/complist.c')
-rw-r--r-- | Src/Zle/complist.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Src/Zle/complist.c b/Src/Zle/complist.c index 94fd2cc56..14cb16d4c 100644 --- a/Src/Zle/complist.c +++ b/Src/Zle/complist.c @@ -1394,7 +1394,7 @@ clprintm(Cmgroup g, Cmatch *mp, int mc, int ml, int lastc, int width, mlastm = m->gnum; if (m->disp && (m->flags & CMF_DISPLINE)) { - if (mselect >= 0) { + if (mselect >= 0 && !(m->flags & CMF_DUMMY)) { int mm = (mcols * ml), i; for (i = mcols; i--; ) { @@ -1441,7 +1441,7 @@ clprintm(Cmgroup g, Cmatch *mp, int mc, int ml, int lastc, int width, } else mx = mc * g->width; - if (mselect >= 0) { + if (mselect >= 0 && !(m->flags & CMF_DUMMY)) { int mm = mcols * ml, i; for (i = (width ? width : mcols); i--; ) { @@ -1482,7 +1482,7 @@ clprintm(Cmgroup g, Cmatch *mp, int mc, int ml, int lastc, int width, len = niceztrlen(m->disp ? m->disp : m->str); mlprinted = len / columns; - if (isset(LISTTYPES) && buf) { + if ((g->flags & CGF_FILES) && buf) { if (m->gnum != mselect) { zcoff(); zcputs(&mcolors, g->name, COL_TC); @@ -1684,6 +1684,7 @@ domenuselect(Hookdef dummy, Chdata dat) noselect = 1; while ((menuacc && !hasbrpsfx(*(minfo.cur), minfo.prebr, minfo.postbr)) || + ((*minfo.cur)->flags & CMF_DUMMY) || (((*minfo.cur)->flags & (CMF_NOLIST | CMF_MULT)) && (!(*minfo.cur)->str || !*(*minfo.cur)->str))) do_menucmp(0); |