diff options
| author | Sven Wischnowsky <wischnow@users.sourceforge.net> | 2000-10-24 07:50:24 +0000 |
|---|---|---|
| committer | Sven Wischnowsky <wischnow@users.sourceforge.net> | 2000-10-24 07:50:24 +0000 |
| commit | ead3cee30d59283b315e9b16b136ed5dd1198340 (patch) | |
| tree | ab747c37770c25256130c598cefcc061883c2fca | |
| parent | 865f3961b7a84613a2537eabb77dc98378840167 (diff) | |
| download | zsh-ead3cee30d59283b315e9b16b136ed5dd1198340.tar.gz zsh-ead3cee30d59283b315e9b16b136ed5dd1198340.tar.xz zsh-ead3cee30d59283b315e9b16b136ed5dd1198340.zip | |
avoid printing file type characters in completion lists for matches ending in a slash (13071)
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Src/Zle/complist.c | 5 | ||||
| -rw-r--r-- | Src/Zle/compresult.c | 3 |
3 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 103ced64b..2384b6893 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2000-10-24 Sven Wischnowsky <wischnow@zsh.org> + + * 13071: Src/Zle/complist.c, Src/Zle/compresult.c: avoid printing + file type characters in completion lists for matches ending in a + slash + 2000-10-23 Sven Wischnowsky <wischnow@zsh.org> * 13037: Completion/Core/_path_files, Doc/Zsh/compsys.yo: change diff --git a/Src/Zle/complist.c b/Src/Zle/complist.c index 2334a2612..af8dea6f0 100644 --- a/Src/Zle/complist.c +++ b/Src/Zle/complist.c @@ -1241,7 +1241,8 @@ compprintlist(int showall) goto end; break; } - if (!m->disp && (m->flags & CMF_FILE)) { + if (!m->disp && (m->flags & CMF_FILE) && + m->str[0] && m->str[strlen(m->str) - 1] != '/') { struct stat buf; char *pb; @@ -1467,7 +1468,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 (isset(LISTTYPES) && buf) { if (m->gnum != mselect) { zcoff(); zcputs(&mcolors, g->name, COL_TC); diff --git a/Src/Zle/compresult.c b/Src/Zle/compresult.c index cce06d1e3..13ae8c3b3 100644 --- a/Src/Zle/compresult.c +++ b/Src/Zle/compresult.c @@ -1886,7 +1886,8 @@ printlist(int over, CLPrintFunc printm, int showall) printm(g, NULL, mc, ml, (!i), wid, NULL, NULL); break; } - if (!m->disp && (m->flags & CMF_FILE)) { + if (!m->disp && (m->flags & CMF_FILE) && + m->str[0] && m->str[strlen(m->str) - 1] != '/') { struct stat buf; char *pb; |