summaryrefslogtreecommitdiff
path: root/lisp/loadup.el
diff options
context:
space:
mode:
authorAnders Lindgren <andlind@gmail.com>2015-12-25 10:55:38 +0100
committerAnders Lindgren <andlind@gmail.com>2015-12-25 10:55:38 +0100
commit3e7f6338d8c32bf4676ee4af036459b25efc3d9b (patch)
treeb8b5283c89c968ce7e0224a6504d8c57b3b58788 /lisp/loadup.el
parentdfad97b6539af4d43a47f070ec200536021ad0a7 (diff)
downloademacs-3e7f6338d8c32bf4676ee4af036459b25efc3d9b.tar.gz
; Re-enabled "File-name completion of non-ASCII characters on OS X (bug#22169)""
; This reverts commit d107eda498f94423d846b0e2f1be7facab417b2a. ; A follow-up to this will be made to ucs-normalize.el etc. to ensure that building from scratch works.
Diffstat (limited to 'lisp/loadup.el')
-rw-r--r--lisp/loadup.el1
1 files changed, 1 insertions, 0 deletions
diff --git a/lisp/loadup.el b/lisp/loadup.el
index f0caa8be349..dda433e4eaf 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