From 94a3606243d3923ac457aeff33f3ce82b65ef6cd Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 25 Dec 2015 13:23:17 +0200 Subject: Fix bootstrap broken by changes related to OS X file-name encoding * lisp/international/ucs-normalize.el (eval-when-compile): Make sure char-code-property-alist includes elements that allow access to 'decomposition' and 'canonical-combining-class' Unicode properties, as compiling ucs-normalize.el requires that. * lisp/loadup.el (featurep 'ns): Load ucs-normalize and ns-win only of charprop.el was already loaded. * src/Makefile.in ($(lispsource)/international/ucs-normalize.elc): New order-only dependency. --- lisp/loadup.el | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'lisp/loadup.el') diff --git a/lisp/loadup.el b/lisp/loadup.el index dda433e4eaf..a58d04223ea 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el @@ -276,8 +276,12 @@ (if (featurep 'ns) (progn (load "term/common-win") - (load "international/ucs-normalize") - (load "term/ns-win"))) + ;; Don't load ucs-normalize.el unless uni-*.el files were + ;; already produced, because it needs uni-*.el files that might + ;; not be built early enough during bootstrap. + (when (load-history-filename-element "charprop\\.el") + (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 ;; mouse-wheel-*-event vars depends on those files being loaded or not. -- cgit v1.2.3-70-g09d2