Merge from origin/emacs-24

[gnu-emacs] / lisp / international / characters.el

diff --git a/lisp/international/characters.el b/lisp/international/characters.el
index 067b1c35fa07b8c97699c8273a1b7ed01836e474..247a10dd38fb4b1c9f5b68f49c3fb1ce6ea75ac8 100644 (file)
--- a/lisp/international/characters.el
+++ b/lisp/international/characters.el
@@ -1,6 +1,6 @@
 ;;; characters.el --- set syntax and category for multibyte characters
 
-;; Copyright (C) 1997, 2000-2014 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2000-2015 Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 ;;   2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
@@ -495,12 +495,13 @@ with L, LRE, or LRO Unicode bidi character type.")
                        (modify-category-entry key ?L))))
                    table)))
 
-;; 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.
+;; Load uni-mirrored.el and uni-brackets.el if available, so that they
+;; get 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 and
+;; uni-brackets.el in order to display the "Loading" messages.
 (unicode-property-table-internal 'mirroring)
+(unicode-property-table-internal 'bracket-type)
 
 ;; Latin