]> code.delx.au - gnu-emacs/blobdiff - lisp/loadup.el
Merge emacs-25 into master (using imerge)
[gnu-emacs] / lisp / loadup.el
index 782622cd0d786508615a6ea2c34b300ae662aa12..e3e0eb7762267e1b01f17d481fbc2df2e0170698 100644 (file)
 (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.