summaryrefslogtreecommitdiff
path: root/Src/Zle/complist.c
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2007-03-30 09:32:17 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2007-03-30 09:32:17 +0000
commit56bf25cff98ec4db85d2a4f3b326368b70417d7b (patch)
treec4d1b9db37898987ded3fa6ab1009015bd463b8b /Src/Zle/complist.c
parentaf8a88e4f5c3ffe5a9d8005709e94b641bc21261 (diff)
downloadzsh-56bf25cff98ec4db85d2a4f3b326368b70417d7b.tar.gz
zsh-56bf25cff98ec4db85d2a4f3b326368b70417d7b.zip
unposted: better fix for complist line wrap from 23248
Diffstat (limited to 'Src/Zle/complist.c')
-rw-r--r--Src/Zle/complist.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/Src/Zle/complist.c b/Src/Zle/complist.c
index 43c93cf54..d379874f2 100644
--- a/Src/Zle/complist.c
+++ b/Src/Zle/complist.c
@@ -1139,10 +1139,7 @@ compprintfmt(char *fmt, int n, int dopr, int doesc, int ml, int *stop)
if (dopr == 1) {
if (ml == mlend - 1 && (cc % columns) == columns - 1) {
dopr = 0;
- if (*p == Meta)
- p += 2;
- else
- p++;
+ p += len;
continue;
}
while (len--) {
@@ -1153,6 +1150,10 @@ compprintfmt(char *fmt, int n, int dopr, int doesc, int ml, int *stop)
} else
putc(*p++, shout);
}
+ /*
+ * TODO: the following doesn't allow for
+ * character widths greater than 1.
+ */
if ((beg = !(cc % columns)) && !stat) {
ml++;
fputs(" \010", shout);