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: Tue, 22 Dec 2015 23:29:16 +0100 [thread overview]
Message-ID: <CABr8ebb98qZ1P5htHsMOUrkSqtyuxUd2yCDg8BDNcEx1uG2BsA@mail.gmail.com> (raw)
In-Reply-To: <838u4mquis.fsf@gnu.org>
[-- Attachment #1: Type: text/plain, Size: 5787 bytes --]
Hi!
I just tried this and I can confirm that it works.
Thanks for your hard work!
I will push my patch for using the utf-8-hfs coding system (most likely)
tomorrow.
-- Anders
On Tue, Dec 22, 2015 at 6:10 PM, Eli Zaretskii <eliz@gnu.org> wrote:
> > Date: Tue, 22 Dec 2015 06:42:47 +0100
> > From: Anders Lindgren <andlind@gmail.com>
> > Cc: random832@fastmail.com, 22169@debbugs.gnu.org
> >
> > > I haven't had time to see what actually happens in the code,
> though.
> > However,
> > > the " if (STRING_MULTIBYTE (file))" looks suspicious as the
> decoded value
> > needs
> > > to be checked even for strings like "a". (However, I don't really
> know
> > what
> > > STRING_MULTIBYTE does.)
> >
> > Does removing the STRING_MULTIBYTE test make it work?
> >
> > Yes, it does:
> >
> > (file-name-all-completions "a" ".")
> > ("aaosecond.txt")
>
> Then please try the final patch below (again against the current
> emacs-25 branch), I hope I didn't goof this time.
>
> Thanks.
>
> diff --git a/lisp/international/ucs-normalize.el
> b/lisp/international/ucs-normalize.el
> index 8839b00..6f2fb28 100644
> --- a/lisp/international/ucs-normalize.el
> +++ b/lisp/international/ucs-normalize.el
> @@ -627,6 +627,10 @@ 'utf-8-hfs
> :pre-write-conversion 'ucs-normalize-hfs-nfd-pre-write-conversion
> )
>
> +;; This is tested in dired.c:file_name_completion in order to reject
> +;; false positives due to comparison of encoded file names.
> +(coding-system-put 'utf-8-hfs 'decomposed-characters 't)
> +
> (provide 'ucs-normalize)
>
> ;; Local Variables:
> diff --git a/src/dired.c b/src/dired.c
> index 84bf247..89bd908 100644
> --- a/src/dired.c
> +++ b/src/dired.c
> @@ -467,6 +467,7 @@ file_name_completion (Lisp_Object file, Lisp_Object
> dirname, bool all_flag,
> well as "." and "..". Until shown otherwise, assume we can't exclude
> anything. */
> bool includeall = 1;
> + bool check_decoded = false;
> ptrdiff_t count = SPECPDL_INDEX ();
>
> elt = Qnil;
> @@ -485,6 +486,28 @@ file_name_completion (Lisp_Object file, Lisp_Object
> dirname, bool all_flag,
> on the encoded file name. */
> encoded_file = ENCODE_FILE (file);
> encoded_dir = ENCODE_FILE (Fdirectory_file_name (dirname));
> +
> + Lisp_Object file_encoding = Vfile_name_coding_system;
> + if (NILP (Vfile_name_coding_system))
> + file_encoding = Vdefault_file_name_coding_system;
> + /* If the file-name encoding decomposes characters, as we do for
> + HFS+ filesystems, we need to make an additional comparison of
> + decoded names in order to filter false positives, such as "a"
> + falsely matching "a-ring". */
> + if (!NILP (file_encoding)
> + && !NILP (Fplist_get (Fcoding_system_plist (file_encoding),
> + Qdecomposed_characters)))
> + {
> + check_decoded = true;
> + if (STRING_MULTIBYTE (file))
> + {
> + /* Recompute FILE to make sure any decomposed characters in
> + it are re-composed by the post-read-conversion.
> + Otherwise, any decomposed characters will be rejected by
> + the additional check below. */
> + file = DECODE_FILE (encoded_file);
> + }
> + }
> int fd;
> DIR *d = open_directory (encoded_dir, &fd);
> record_unwind_protect_ptr (directory_files_internal_unwind, d);
> @@ -637,6 +660,21 @@ 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 match, but the
> + decoded don't. For example, "a" should not match "a-ring" on
> + file systems that store decomposed characters. */
> + Lisp_Object zero = make_number (0);
> + Lisp_Object compare;
> + Lisp_Object cmp;
> + if (check_decoded && SCHARS (file) <= SCHARS (name))
> + {
> + compare = make_number (SCHARS (file));
> + cmp = Fcompare_strings (name, zero, compare, file, zero, compare,
> + completion_ignore_case ? Qt : Qnil);
> + if (!EQ (cmp, Qt))
> + continue;
> + }
> +
> /* Suitably record this match. */
>
> matchcount += matchcount <= 1;
> @@ -650,15 +688,13 @@ 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
> - = Fcompare_strings (bestmatch, zero,
> - make_number (compare),
> - name, zero,
> - make_number (compare),
> - completion_ignore_case ? Qt : Qnil);
> + compare = min (bestmatchsize, SCHARS (name));
> + cmp = Fcompare_strings (bestmatch, zero,
> + make_number (compare),
> + name, zero,
> + make_number (compare),
> + completion_ignore_case ? Qt : Qnil);
> ptrdiff_t matchsize = EQ (cmp, Qt) ? compare : eabs (XINT (cmp))
> - 1;
>
> if (completion_ignore_case)
> @@ -1007,6 +1043,7 @@ syms_of_dired (void)
> DEFSYM (Qfile_attributes, "file-attributes");
> DEFSYM (Qfile_attributes_lessp, "file-attributes-lessp");
> DEFSYM (Qdefault_directory, "default-directory");
> + DEFSYM (Qdecomposed_characters, "decomposed-characters");
>
> defsubr (&Sdirectory_files);
> defsubr (&Sdirectory_files_and_attributes);
>
[-- Attachment #2: Type: text/html, Size: 7616 bytes --]
next prev parent reply other threads:[~2015-12-22 22:29 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
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 [this message]
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=CABr8ebb98qZ1P5htHsMOUrkSqtyuxUd2yCDg8BDNcEx1uG2BsA@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.