Mercurial > emacs
changeset 108689:194ff305ac3f
composite.el: Register compose-gstring-for-graphic in composition-function-table only for combining characters (Mn, Mc, Me).
| author | Kenichi Handa <handa@etlken> |
|---|---|
| date | Wed, 19 May 2010 10:26:40 +0900 |
| parents | 1e3c6cb46d2a (current diff) 452cd1d4f5ad (diff) |
| children | 2068a9dec459 |
| files | |
| diffstat | 2 files changed, 10 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Tue May 18 17:49:56 2010 -0500 +++ b/lisp/ChangeLog Wed May 19 10:26:40 2010 +0900 @@ -1,3 +1,9 @@ +2010-05-19 Kenichi Handa <handa@m17n.org> + + * composite.el: Register compose-gstring-for-graphic in + composition-function-table only for combining characters (Mn, Mc, + Me). + 2010-05-18 Jay Belanger <jay.p.belanger@gmail.com> * calc/calc-trail.el (calc-trail-isearch-forward)
--- a/lisp/composite.el Tue May 18 17:49:56 2010 -0500 +++ b/lisp/composite.el Wed May 19 10:26:40 2010 +0900 @@ -532,9 +532,9 @@ (defun compose-gstring-for-graphic (gstring) "Compose glyph-string GSTRING for graphic display. -Non-spacing characters are composed with the preceding base +Combining characters are composed with the preceding base character. If the preceding character is not a base character, -each non-spacing character is composed as a spacing character by +each combining character is composed as a spacing character by a padding space before and/or after the character. All non-spacing characters has this function in @@ -660,9 +660,9 @@ [nil 0 compose-gstring-for-graphic]))) (map-char-table #'(lambda (key val) - (if (= val 0) + (if (memq val '(Mn Mc Me)) (set-char-table-range composition-function-table key elt))) - char-width-table)) + unicode-category-table)) (defun compose-gstring-for-terminal (gstring) "Compose glyph string GSTRING for terminal display.