diff options
| author | Anders Lindgren <andlind@gmail.com> | 2015-12-23 07:15:45 +0100 |
|---|---|---|
| committer | Anders Lindgren <andlind@gmail.com> | 2015-12-23 07:15:45 +0100 |
| commit | 09053075225fec8a6cf7a72017a6dfc1ec6b6f0c (patch) | |
| tree | fd9ce26de7a7c7cd94502ca02a4155f821694aaa /lisp/term | |
| parent | 781770b4dcfe44b255e94e16479fd14633803640 (diff) | |
File-name completion of non-ASCII characters on OS X (bug#22169)
The coding system `utf-8-nfd', locally defined in ns-win.el,
didn't provide a :pre-write-conversion method, causing file name
completion of non-ASCII characters to fail. Solved by using the
`utf-8-hfs' coding system provided by `ucs-normalize'.
* lisp/loadup.el: Load international/ucs-normalize (when building
for ns).
* lisp/term/ns-win.el (utf-8-nfd): Made `utf-8-nfd' as alias for
`utf-8-hfs' and removed the old implementation. Set `utf-8-hfs'
as the file name coding system.
* src/nsfns.c (ns-convert-utf8-nfd-to-nfc): Removed.
Diffstat (limited to 'lisp/term')
| -rw-r--r-- | lisp/term/ns-win.el | 28 |
1 files changed, 6 insertions, 22 deletions
diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el index 0b3e3bd9d9..9bd59fc195 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 @@ See `ns-insert-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. |