diff options
Diffstat (limited to 'lisp/loadup.el')
| -rw-r--r-- | lisp/loadup.el | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lisp/loadup.el b/lisp/loadup.el index 782622cd0d7..e3e0eb77622 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el @@ -281,7 +281,12 @@ (if (featurep 'ns) (progn (load "term/common-win") - (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. |