diff options
| author | Glenn Morris <rgm@gnu.org> | 2017-04-26 12:51:48 -0400 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2017-04-26 12:51:48 -0400 |
| commit | 8f2062d96b0319fc2a837ba9e2c6b67abf31c920 (patch) | |
| tree | 32962ec255b4bcc22af831c50cb139abc2aaccc2 /lisp/loadup.el | |
| parent | efb4ea9987c7b2ee6f7a66c0bc02c907ca987a24 (diff) | |
| download | emacs-8f2062d96b0319fc2a837ba9e2c6b67abf31c920.tar.gz | |
Make charprop.el provide a feature
* admin/unidata/unidata-gen.el (unidata-gen-charprop):
Provide a feature.
* lisp/loadup.el: Use the charprop feature.
Diffstat (limited to 'lisp/loadup.el')
| -rw-r--r-- | lisp/loadup.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/loadup.el b/lisp/loadup.el index 4f28352d39e..af42cd97111 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el @@ -184,8 +184,8 @@ (load "case-table") ;; This file doesn't exist when building a development version of Emacs ;; from the repository. It is generated just after temacs is built. -(if ; this formatting is for the Makefile - (load "international/charprop.el" t) +(load "international/charprop.el" t) +(if (featurep 'charprop) (setq redisplay--inhibit-bidi nil)) (load "international/characters") (load "composite") @@ -303,7 +303,7 @@ ;; 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") + (when (featurep 'charprop) (load "international/mule-util") (load "international/ucs-normalize") (load "term/ns-win")))) |