2 files changed, 12 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ee7d61c7389..c35be3ec270 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2014-04-03  Eli Zaretskii  <eliz@gnu.org>
+
+        * international/characters.el: Preload uni-mirrored.el.  (Bug#17169)
+
 2014-04-03  Glenn Morris  <rgm@gnu.org>
 
         * files.el (make-backup-file-name-function)
diff --git a/lisp/international/characters.el b/lisp/international/characters.el
index 2b656375ca2..f00e49d3bb0 100644
--- a/lisp/international/characters.el
+++ b/lisp/international/characters.el
@@ -495,6 +495,14 @@ 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)
+
 ;; Latin
 
 (modify-category-entry '(#x80 . #x024F) ?l)