diff options
| author | Kenichi Handa | 2007-07-20 01:53:08 +0000 |
|---|---|---|
| committer | Kenichi Handa | 2007-07-20 01:53:08 +0000 |
| commit | 7c0953573e29df316e98d8efef4f55848bfcc448 (patch) | |
| tree | 945287293debf0f3d7bc8c51f90a2e06d3e48a8e | |
| parent | c0edfa75c48d19c878dc63cd0941a56653adfeb4 (diff) | |
| download | emacs-7c0953573e29df316e98d8efef4f55848bfcc448.tar.gz emacs-7c0953573e29df316e98d8efef4f55848bfcc448.zip | |
(utf-8-post-read-conversion): Temporarily
bind utf-8-compose-scripts to nil while running *-compose-region
functions.
| -rw-r--r-- | lisp/international/utf-8.el | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/lisp/international/utf-8.el b/lisp/international/utf-8.el index 2d8791b49e3..66e8181c7ca 100644 --- a/lisp/international/utf-8.el +++ b/lisp/international/utf-8.el | |||
| @@ -991,16 +991,20 @@ Also compose particular scripts if `utf-8-compose-scripts' is non-nil." | |||
| 991 | (set-buffer-multibyte nil))) | 991 | (set-buffer-multibyte nil))) |
| 992 | 992 | ||
| 993 | (when (and utf-8-compose-scripts (> length 1)) | 993 | (when (and utf-8-compose-scripts (> length 1)) |
| 994 | ;; These currently have definitions which cover the relevant | 994 | ;; This let-binding avoids recursive auto-loading. And, we |
| 995 | ;; unicodes. We could avoid loading thai-util &c by checking | 995 | ;; anyway don't have to run the following code while |
| 996 | ;; whether the region contains any characters with the appropriate | 996 | ;; auto-loading. |
| 997 | ;; categories. There aren't yet Unicode-based rules for Tibetan. | 997 | (let ((utf-8-compose-scripts nil)) |
| 998 | (diacritic-compose-region (point-max) (point-min)) | 998 | ;; These currently have definitions which cover the relevant |
| 999 | (thai-compose-region (point-max) (point-min)) | 999 | ;; unicodes. We could avoid loading thai-util &c by checking |
| 1000 | (lao-compose-region (point-max) (point-min)) | 1000 | ;; whether the region contains any characters with the appropriate |
| 1001 | (devanagari-compose-region (point-max) (point-min)) | 1001 | ;; categories. There aren't yet Unicode-based rules for Tibetan. |
| 1002 | (malayalam-compose-region (point-max) (point-min)) | 1002 | (diacritic-compose-region (point-max) (point-min)) |
| 1003 | (tamil-compose-region (point-max) (point-min))) | 1003 | (thai-compose-region (point-max) (point-min)) |
| 1004 | (lao-compose-region (point-max) (point-min)) | ||
| 1005 | (devanagari-compose-region (point-max) (point-min)) | ||
| 1006 | (malayalam-compose-region (point-max) (point-min)) | ||
| 1007 | (tamil-compose-region (point-max) (point-min)))) | ||
| 1004 | (- (point-max) (point-min))))) | 1008 | (- (point-max) (point-min))))) |
| 1005 | 1009 | ||
| 1006 | (defun utf-8-pre-write-conversion (beg end) | 1010 | (defun utf-8-pre-write-conversion (beg end) |