diff options
| author | Eli Zaretskii | 2014-04-04 11:26:00 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2014-04-04 11:26:00 +0300 |
| commit | b7cf27edd37249c60ae1c8f6a11db4707e793c3e (patch) | |
| tree | e5824cd04e0d2513968849e53f2d5eeb50fede49 | |
| parent | 8a1d24b11ef7bfed0752896cbfbcdd793f100b03 (diff) | |
| download | emacs-b7cf27edd37249c60ae1c8f6a11db4707e793c3e.tar.gz emacs-b7cf27edd37249c60ae1c8f6a11db4707e793c3e.zip | |
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/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/international/characters.el | 13 |
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 @@ | |||
| 1 | 2014-04-04 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * international/characters.el (mirroring): Fix last change: | ||
| 4 | instead of loading uni-mirrored.el explicitly, do that implicitly | ||
| 5 | by creating the 'mirroring' uniprop table. This avoids announcing | ||
| 6 | the loading of uni-mirrored.el. | ||
| 7 | |||
| 1 | 2014-04-04 Glenn Morris <rgm@gnu.org> | 8 | 2014-04-04 Glenn Morris <rgm@gnu.org> |
| 2 | 9 | ||
| 3 | * files.el (buffer-stale--default-function) | 10 | * 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.") | |||
| 495 | (modify-category-entry key ?L)))) | 495 | (modify-category-entry key ?L)))) |
| 496 | table))) | 496 | table))) |
| 497 | 497 | ||
| 498 | ;; Load this if available, so that it gets dumped into Emacs. This | 498 | ;; Load uni-mirrored.el if available, so that it gets dumped into |
| 499 | ;; allows to start Emacs with force-load-messages in ~/.emacs, and | 499 | ;; Emacs. This allows to start Emacs with force-load-messages in |
| 500 | ;; avoid infinite recursion in bidi_initialize, which needs to load | 500 | ;; ~/.emacs, and avoid infinite recursion in bidi_initialize, which |
| 501 | ;; uni-mirrored.el in order to display "Loading" messages. We use | 501 | ;; needs to load uni-mirrored.el in order to display the "Loading" |
| 502 | ;; 'no-error to avoid error messages when bootstrapping without | 502 | ;; messages. |
| 503 | ;; generated uni-*.el files. | 503 | (unicode-property-table-internal 'mirroring) |
| 504 | (load "international/uni-mirrored" 'no-error) | ||
| 505 | 504 | ||
| 506 | ;; Latin | 505 | ;; Latin |
| 507 | 506 | ||