summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2014-04-04 11:26:00 +0300
committerEli Zaretskii <eliz@gnu.org>2014-04-04 11:26:00 +0300
commitb7cf27edd37249c60ae1c8f6a11db4707e793c3e (patch)
treee5824cd04e0d2513968849e53f2d5eeb50fede49
parent8a1d24b11ef7bfed0752896cbfbcdd793f100b03 (diff)
downloademacs-b7cf27edd37249c60ae1c8f6a11db4707e793c3e.tar.gz
A better fix for bug #17169.
lisp/international/characters.el (mirroring): Fix last change: instead of loading uni-mirrored.el explicitly, do that implicitly by creating the 'mirroring' uniprop table. This avoids announcing the loading of uni-mirrored.el.
-rw-r--r--lisp/ChangeLog7
-rw-r--r--lisp/international/characters.el13
2 files changed, 13 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f6340047e0a..a49b0e7dc7c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2014-04-04 Eli Zaretskii <eliz@gnu.org>
+
+ * international/characters.el (mirroring): Fix last change:
+ instead of loading uni-mirrored.el explicitly, do that implicitly
+ by creating the 'mirroring' uniprop table. This avoids announcing
+ the loading of uni-mirrored.el.
+
2014-04-04 Glenn Morris <rgm@gnu.org>
* files.el (buffer-stale--default-function)
diff --git a/lisp/international/characters.el b/lisp/international/characters.el
index f00e49d3bb0..54ab362df04 100644
--- a/lisp/international/characters.el
+++ b/lisp/international/characters.el
@@ -495,13 +495,12 @@ with L, LRE, or LRO Unicode bidi character type.")
(modify-category-entry key ?L))))
table)))
-;; Load this if available, so that it gets dumped into Emacs. This
-;; allows to start Emacs with force-load-messages in ~/.emacs, and
-;; avoid infinite recursion in bidi_initialize, which needs to load
-;; uni-mirrored.el in order to display "Loading" messages. We use
-;; 'no-error to avoid error messages when bootstrapping without
-;; generated uni-*.el files.
-(load "international/uni-mirrored" 'no-error)
+;; Load uni-mirrored.el if available, so that it gets dumped into
+;; Emacs. This allows to start Emacs with force-load-messages in
+;; ~/.emacs, and avoid infinite recursion in bidi_initialize, which
+;; needs to load uni-mirrored.el in order to display the "Loading"
+;; messages.
+(unicode-property-table-internal 'mirroring)
;; Latin