From: Glenn Morris Date: Wed, 26 Apr 2017 16:51:48 +0000 (-0400) Subject: Make charprop.el provide a feature X-Git-Tag: emacs-26.0.90~521^2~540 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8f2062d96b0319fc2a837ba9e2c6b67abf31c920;p=emacs.git Make charprop.el provide a feature * admin/unidata/unidata-gen.el (unidata-gen-charprop): Provide a feature. * lisp/loadup.el: Use the charprop feature. --- diff --git a/admin/unidata/unidata-gen.el b/admin/unidata/unidata-gen.el index cdd7ff01db4..64e2babd4b9 100644 --- a/admin/unidata/unidata-gen.el +++ b/admin/unidata/unidata-gen.el @@ -1450,7 +1450,10 @@ Property value is a symbol `o' (Open), `c' (Close), or `n' (None)." (unidata-prop-prop proplist) (car elt) (unidata-prop-docstring proplist))))) (or noninteractive (message "Writing %s..." charprop-file)) - (insert ";; Local Variables:\n" + (insert "\n" + "(provide 'charprop)\n" + " \n" + ";; Local Variables:\n" ";; coding: utf-8\n" ";; version-control: never\n" ";; no-byte-compile: t\n" 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"))))