From: Anders Lindgren <andlind@gmail.com>
To: Eli Zaretskii <eliz@gnu.org>
Cc: 22169@debbugs.gnu.org
Subject: bug#22169: 25.0.50; File name compiletion doesn't work with non-ASCII characters on OS X
Date: Thu, 17 Dec 2015 23:01:01 +0100 [thread overview]
Message-ID: <CABr8ebYBH3dSp=_L3bBKBy_8a+wfLSk4LaH+E6MqKa4ERiCxbw@mail.gmail.com> (raw)
In-Reply-To: <CABr8eba8XXM8z2-R0cuWVcrjd9udGLA48inSvzy7qTd+itkQXw@mail.gmail.com>
[-- Attachment #1.1: Type: text/plain, Size: 1470 bytes --]
Hi!
I think I have solved this.
The current coding system defined in ns-win.el didn't work because it only
provided a decode but no encode functions.
After revisiting the "hfs" encoder, I managed to get it to work, this time.
Below is a patch where I have dropped the old encoder and use the new
instead. The only thing noteworthy is that `ucs-normalize' is loaded by
loadup (when ns is used) and thus included in the dumped Emacs (if I
understand correctly). Unless anybody objects, I'll push it in a couple of
days.
-- Anders
On Tue, Dec 15, 2015 at 9:05 PM, Anders Lindgren <andlind@gmail.com> wrote:
> Hi,
>
>
>> Can you write a patch to that effect, for emacs-25 branch?
>>
>
> We have the find the cause of the problem first. But once we do that, this
> should be straight forward.
>
>
> > What does this return:
>> >
>> > M-: (file-name-all-completion "åäö" "/that/empty/directory/") RET
>> >
>> > It returns nil.
>>
>> So this is the heart of the problem. I assume that if you do the same
>> with an ASCII first argument, the result is non-nil, yes?
>>
>
> Yes.
>
>
>
>> Then the next step is to step with a debugger through
>> file_name_completion, and see why this returns nil instead of a list
>> of files that begin.
>>
>
> Auhm, I'll see what I can do. I'm a family father and have very, very,
> limited time, but I can see in I can find a time slot for it.
>
> -- Anders
>
>
[-- Attachment #1.2: Type: text/html, Size: 2639 bytes --]
[-- Attachment #2: coding.diff --]
[-- Type: text/plain, Size: 3333 bytes --]
diff --git a/lisp/loadup.el b/lisp/loadup.el
index f0caa8b..dda433e 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -276,6 +276,7 @@
(if (featurep 'ns)
(progn
(load "term/common-win")
+ (load "international/ucs-normalize")
(load "term/ns-win")))
(if (fboundp 'x-create-frame)
;; Do it after loading term/foo-win.el since the value of the
diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el
index 0b3e3bd..9bd59fc 100644
--- a/lisp/term/ns-win.el
+++ b/lisp/term/ns-win.el
@@ -51,6 +51,7 @@
(require 'menu-bar)
(require 'fontset)
(require 'dnd)
+(require 'ucs-normalize)
(defgroup ns nil
"GNUstep/Mac OS X specific features."
@@ -337,29 +338,12 @@ ns-delete-working-text
(setq ns-working-overlay nil))
-(declare-function ns-convert-utf8-nfd-to-nfc "nsfns.m" (str))
-
-;;;; OS X file system Unicode UTF-8 NFD (decomposed form) support
-;; Lisp code based on utf-8m.el, by Seiji Zenitani, Eiji Honjoh, and
-;; Carsten Bormann.
+;; OS X file system Unicode UTF-8 NFD (decomposed form) support.
(when (eq system-type 'darwin)
- (defun ns-utf8-nfd-post-read-conversion (length)
- "Calls `ns-convert-utf8-nfd-to-nfc' to compose char sequences."
- (save-excursion
- (save-restriction
- (narrow-to-region (point) (+ (point) length))
- (let ((str (buffer-string)))
- (delete-region (point-min) (point-max))
- (insert (ns-convert-utf8-nfd-to-nfc str))
- (- (point-max) (point-min))))))
-
- (define-coding-system 'utf-8-nfd
- "UTF-8 NFD (decomposed) encoding."
- :coding-type 'utf-8
- :mnemonic ?U
- :charset-list '(unicode)
- :post-read-conversion 'ns-utf8-nfd-post-read-conversion)
- (set-file-name-coding-system 'utf-8-nfd))
+ ;; Used prior to Emacs 25.
+ (define-coding-system-alias 'utf-8-nfd 'utf-8-hfs)
+
+ (set-file-name-coding-system 'utf-8-hfs))
;;;; Inter-app communications support.
diff --git a/src/nsfns.m b/src/nsfns.m
index edc02e8..5fa68c0 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -2099,39 +2099,6 @@ there was no result. */)
}
-DEFUN ("ns-convert-utf8-nfd-to-nfc", Fns_convert_utf8_nfd_to_nfc,
- Sns_convert_utf8_nfd_to_nfc, 1, 1, 0,
- doc: /* Return an NFC string that matches the UTF-8 NFD string STR. */)
- (Lisp_Object str)
-{
-/* TODO: If GNUstep ever implements precomposedStringWithCanonicalMapping,
- remove this. */
- NSString *utfStr;
- Lisp_Object ret = Qnil;
- NSAutoreleasePool *pool;
-
- CHECK_STRING (str);
- pool = [[NSAutoreleasePool alloc] init];
- utfStr = [NSString stringWithUTF8String: SSDATA (str)];
-#ifdef NS_IMPL_COCOA
- if (utfStr)
- utfStr = [utfStr precomposedStringWithCanonicalMapping];
-#endif
- if (utfStr)
- {
- const char *cstr = [utfStr UTF8String];
- if (cstr)
- ret = build_string (cstr);
- }
-
- [pool release];
- if (NILP (ret))
- error ("Invalid UTF-8");
-
- return ret;
-}
-
-
#ifdef NS_IMPL_COCOA
/* Compile and execute the AppleScript SCRIPT and return the error
@@ -3207,7 +3174,6 @@ be used as the image of the icon representing the frame. */);
defsubr (&Sns_emacs_info_panel);
defsubr (&Sns_list_services);
defsubr (&Sns_perform_service);
- defsubr (&Sns_convert_utf8_nfd_to_nfc);
defsubr (&Sns_popup_font_panel);
defsubr (&Sns_popup_color_panel);
next prev parent reply other threads:[~2015-12-17 22:01 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 [this message]
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
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='CABr8ebYBH3dSp=_L3bBKBy_8a+wfLSk4LaH+E6MqKa4ERiCxbw@mail.gmail.com' \
--to=andlind@gmail.com \
--cc=22169@debbugs.gnu.org \
--cc=eliz@gnu.org \
/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.