summary refs log tree commit diff
path: root/Src
diff options
context:
space:
mode:
authorSven Wischnowsky <wischnow@users.sourceforge.net>2000-10-24 07:50:24 +0000
committerSven Wischnowsky <wischnow@users.sourceforge.net>2000-10-24 07:50:24 +0000
commitead3cee30d59283b315e9b16b136ed5dd1198340 (patch)
treeab747c37770c25256130c598cefcc061883c2fca /Src
parent865f3961b7a84613a2537eabb77dc98378840167 (diff)
downloadzsh-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)
Diffstat (limited to 'Src')
-rw-r--r--Src/Zle/complist.c5
-rw-r--r--Src/Zle/compresult.c3
2 files changed, 5 insertions, 3 deletions
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;