diff options
| author | John Wiegley <johnw@newartisans.com> | 2015-12-29 21:40:28 -0800 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2015-12-29 21:40:28 -0800 |
| commit | 9f2f14a0725211b13a744573344636b57b9c98b9 (patch) | |
| tree | 7190e0fb3d4aa06018d8cf997f06b806fb09a9c8 /lisp/loadup.el | |
| parent | d259328fb87db8cc67d52771efcfa653e52c5b71 (diff) | |
| parent | e823c34072bf045800d91e12c7ddb61fa23c6e30 (diff) | |
| download | emacs-9f2f14a0725211b13a744573344636b57b9c98b9.tar.gz | |
Merge emacs-25 into master (using imerge)
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. |