From: Anders Lindgren <andlind@gmail.com>
To: Eli Zaretskii <eliz@gnu.org>
Cc: random832@fastmail.com, 22169@debbugs.gnu.org
Subject: bug#22169: 25.0.50; File name compiletion doesn't work with non-ASCII characters on OS X
Date: Sun, 20 Dec 2015 23:00:40 +0100 [thread overview]
Message-ID: <CABr8ebYL-s4ZJsUV3n2tydvfcQDa88BAFLFyxmB+YVHrqwnuDw@mail.gmail.com> (raw)
In-Reply-To: <8337uwucyt.fsf@gnu.org>
[-- Attachment #1.1: Type: text/plain, Size: 1855 bytes --]
Hi!
I managed to get the attached patch to work (when used in conjunction with
my previous patch).
I've tested:
* C-x C-f a TAB
* (find-file-all-competions "a" ".")
-- Anders
On Sun, Dec 20, 2015 at 8:39 PM, Eli Zaretskii <eliz@gnu.org> wrote:
> > Date: Sun, 20 Dec 2015 20:16:29 +0100
> > From: Anders Lindgren <andlind@gmail.com>
> > Cc: random832@fastmail.com, 22169@debbugs.gnu.org
> >
> > Unfortunately, it still doesn't work, the "a" is still deleted. You can
> see
> > what happens here:
> >
> > (file-name-all-completions "" ".")
> > ("åäö.txt" "aao.txt" "../" "./")
> >
> > (file-name-all-completions "a" ".")
> > ("åäö.txt" "aao.txt") <= Incorrect result
>
> So something's wrong with the patch I wrote, because it was supposed
> to reject "åäö.txt" in the last case. Can you see why it didn't?
>
> > I gave this a bit of thinking, would the following work:
> >
> > - For each match of the current system (using encoded comparison), after
> the
> > decoding of the entry, perform a second comparison with the decoded
> (original)
> > version of "file" (when not empty).
> >
> > There is no extra decoding included, as the number of entries decoded is
> the
> > same as before (even if some entries will be rejected now). The extra
> > comparison is only performed if "file" is not empty, so it will not
> affect
> > normal directory retrieval, only when performing a completion operation.
> >
> > Concretely, in the example above, completing "a" will find both entries
> which
> > are decoded. However, the second comparison will reject "åäö.txt".
>
> That's exactly what my patch was supposed to do -- it makes a second
> comparison right before adding a candidate to the result. If you can
> see why it isn't working, we can take it from there.
>
> Thanks.
>
[-- Attachment #1.2: Type: text/html, Size: 2775 bytes --]
[-- Attachment #2: coding2.diff --]
[-- Type: text/plain, Size: 1279 bytes --]
diff --git a/src/dired.c b/src/dired.c
index 84bf247..a2f388c 100644
--- a/src/dired.c
+++ b/src/dired.c
@@ -637,6 +637,20 @@ file_name_completion (Lisp_Object file, Lisp_Object dirname, bool all_flag,
if (!NILP (predicate) && NILP (call1 (predicate, name)))
continue;
+ /* Reject entries where the encoded strings matched but the
+ decoded doesn't. Concretely, "a" should not match "a-ring"
+ on file system encoded using UTF-8 decomposed characters. */
+ Lisp_Object zero = make_number (0);
+ if (SCHARS (file) <= SCHARS (name))
+ {
+ Lisp_Object cmp
+ = Fcompare_strings (name, zero, make_number (SCHARS (file)),
+ file, zero, make_number (SCHARS (file)),
+ completion_ignore_case ? Qt : Qnil);
+ if (!EQ (cmp, Qt))
+ continue;
+ }
+
/* Suitably record this match. */
matchcount += matchcount <= 1;
@@ -650,7 +664,6 @@ file_name_completion (Lisp_Object file, Lisp_Object dirname, bool all_flag,
}
else
{
- Lisp_Object zero = make_number (0);
/* FIXME: This is a copy of the code in Ftry_completion. */
ptrdiff_t compare = min (bestmatchsize, SCHARS (name));
Lisp_Object cmp
next prev parent reply other threads:[~2015-12-20 22:00 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-14 19:08 bug#22169: 25.0.50; File name compiletion doesn't work with non-ASCII characters on OS X Anders Lindgren
2015-12-14 19:20 ` Eli Zaretskii
2015-12-14 21:09 ` Eli Zaretskii
2015-12-14 22:07 ` Anders Lindgren
2015-12-15 3:42 ` Eli Zaretskii
2015-12-15 5:12 ` Anders Lindgren
2015-12-15 9:31 ` Andreas Schwab
2015-12-15 10:21 ` Anders Lindgren
2015-12-15 16:11 ` Eli Zaretskii
2015-12-15 15:58 ` Eli Zaretskii
2015-12-15 19:16 ` Anders Lindgren
2015-12-15 19:56 ` Eli Zaretskii
2015-12-15 20:05 ` Anders Lindgren
2015-12-17 22:01 ` Anders Lindgren
2015-12-18 2:46 ` Random832
2015-12-18 6:29 ` Anders Lindgren
2015-12-18 7:07 ` Eli Zaretskii
2015-12-18 15:26 ` Random832
2015-12-18 17:06 ` Eli Zaretskii
2015-12-20 17:56 ` Eli Zaretskii
2015-12-20 19:16 ` Anders Lindgren
2015-12-20 19:39 ` Eli Zaretskii
2015-12-20 22:00 ` Anders Lindgren [this message]
2015-12-21 3:39 ` Eli Zaretskii
2015-12-21 6:52 ` Anders Lindgren
2015-12-21 16:09 ` Eli Zaretskii
2015-12-21 22:03 ` Anders Lindgren
2015-12-22 3:37 ` Eli Zaretskii
2015-12-22 5:42 ` Anders Lindgren
2015-12-22 17:10 ` Eli Zaretskii
2015-12-22 22:29 ` Anders Lindgren
2015-12-23 3:37 ` Eli Zaretskii
2015-12-23 6:17 ` Anders Lindgren
2015-12-23 17:36 ` Eli Zaretskii
2015-12-24 19:23 ` Anders Lindgren
2015-12-24 19:33 ` Anders Lindgren
2015-12-24 19:42 ` Eli Zaretskii
2015-12-18 7:25 ` Eli Zaretskii
2015-12-18 8:38 ` Anders Lindgren
2015-12-18 9:15 ` Eli Zaretskii
2015-12-18 15:42 ` Random832
2015-12-15 21:53 ` Random832
2015-12-16 3:32 ` Eli Zaretskii
2015-12-16 5:05 ` Random832
2015-12-16 10:17 ` Eli Zaretskii
2015-12-16 16:00 ` Random832
2015-12-16 17:22 ` Eli Zaretskii
2015-12-16 18:19 ` Random832
2015-12-16 18:51 ` Eli Zaretskii
2015-12-14 20:49 ` Random832
2015-12-14 22:41 ` bug#22169: 25.0.50; File name compiletion doesn't work with non-ASCII ch Anders Lindgren
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=CABr8ebYL-s4ZJsUV3n2tydvfcQDa88BAFLFyxmB+YVHrqwnuDw@mail.gmail.com \
--to=andlind@gmail.com \
--cc=22169@debbugs.gnu.org \
--cc=eliz@gnu.org \
--cc=random832@fastmail.com \
/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 external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.