mirror/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2024-10-01 08:21:17 +02:00
Code

22069: completion listings didn't get unmetafied

Browse Source
This commit is contained in:
Peter Stephenson 2005-12-10 21:04:42 +00:00
parent d06bc82c93
commit 00e0c063ac
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2005-12-10 Peter Stephenson <p.w.stephenson@ntlworld.com>
* 22069: Src/Zle/complist.c: completion listings didn't get
unmetafied.
2005-12-10 Clint Adams <clint@zsh.org>
* 22068: Completion/Debian/Command/_debdiff: completion

16
Src/Zle/complist.c
View File

@ -879,10 +879,12 @@ compprintfmt(char *fmt, int n, int dopr, int doesc, int ml, int *stop)
fmt = mlistp;
}
for (p = fmt; *p; p++) {
if (doesc && *p == '%') {
if (*++p) {
int chr = (*p == Meta) ? *++p ^ 32 : *p;
if (doesc && chr == '%') {
chr = (*++p == Meta) ? *++p ^ 32 : *p;
if (chr) {
m = 0;
switch (*p) {
switch (chr) {
case '%':
if (dopr == 1)
putc('%', shout);
@ -929,7 +931,7 @@ compprintfmt(char *fmt, int n, int dopr, int doesc, int ml, int *stop)
case '{':
for (p++; *p && (*p != '%' || p[1] != '}'); p++)
if (dopr)
putc(*p, shout);
putc(*p == Meta ? *++p ^ 32 : *p, shout);
if (*p)
p++;
else
@ -1006,9 +1008,9 @@ compprintfmt(char *fmt, int n, int dopr, int doesc, int ml, int *stop)
} else
break;
} else {
if ((++cc == columns - 2 || *p == '\n') && stat)
if ((++cc == columns - 2 || chr == '\n') && stat)
dopr = 2;
if (*p == '\n') {
if (chr == '\n') {
if (dopr == 1 && mlbeg >= 0 && tccan(TCCLEAREOL))
tcout(TCCLEAREOL);
l += 1 + ((cc - 1) / columns);
@ -1019,7 +1021,7 @@ compprintfmt(char *fmt, int n, int dopr, int doesc, int ml, int *stop)
dopr = 0;
continue;
}
putc(*p, shout);
putc(chr, shout);
if ((beg = !(cc % columns)) && !stat) {
ml++;
fputs(" \010", shout);