From: Peter Stephenson <p.w.stephenson@ntlworld.com>
To: Zsh Hackers' List <zsh-workers@sunsite.dk>
Subject: Re: Completion listing multibyte bug? was: Re: Simple Tip of the Day
Date: Sat, 10 Dec 2005 20:45:52 +0000 [thread overview]
Message-ID: <20051210204552.10b2ef7f.p.w.stephenson@ntlworld.com> (raw)
In-Reply-To: <237967ef0512021807w74299bb3j85c0f6c3b099722c@mail.gmail.com>
On Sat, 3 Dec 2005 03:07:18 +0100
Mikael Magnusson <mikachu@gmail.com> wrote:
> I just noticed while sorting some mp3's that cd -<tab> lists multibyte
> paths wrong:
I believe this fixes the problem. This is an old bug: it would be wrong
with metafied characters even without multibyte support.
Index: Src/Zle/complist.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/Zle/complist.c,v
retrieving revision 1.78
diff -u -r1.78 complist.c
--- Src/Zle/complist.c 15 Nov 2005 08:44:18 -0000 1.78
+++ Src/Zle/complist.c 10 Dec 2005 20:43:03 -0000
@@ -879,10 +879,12 @@
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 @@
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 @@
} 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 @@
dopr = 0;
continue;
}
- putc(*p, shout);
+ putc(chr, shout);
if ((beg = !(cc % columns)) && !stat) {
ml++;
fputs(" \010", shout);
--
Peter Stephenson <p.w.stephenson@ntlworld.com>
Web page still at http://www.pwstephenson.fsnet.co.uk/
next parent reply other threads:[~2005-12-10 20:46 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <237967ef0512021807w74299bb3j85c0f6c3b099722c@mail.gmail.com>
2005-12-10 20:45 ` Peter Stephenson [this message]
2005-12-11 10:54 ` Mikael Magnusson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20051210204552.10b2ef7f.p.w.stephenson@ntlworld.com \
--to=p.w.stephenson@ntlworld.com \
--cc=zsh-workers@sunsite.dk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).