From: Kenichi Handa Date: Wed, 19 May 2010 01:09:50 +0000 (+0900) Subject: composite.el: Register compose-gstring-for-graphic in composition-function-table... X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~209 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2833d9158d6315b59415173df5d47515faac5310;p=emacs.git composite.el: Register compose-gstring-for-graphic in composition-function-table only for combining characters (Mn, Mc, Me). --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 484ae6529c3..21d0e827f67 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2010-05-19 Kenichi Handa + + * composite.el: Register compose-gstring-for-graphic in + composition-function-table only for combining characters (Mn, Mc, + Me). + 2010-05-13 Chong Yidong Add TeX open-block and close-block keybindings to SGML, and vice diff --git a/lisp/composite.el b/lisp/composite.el index 2204b351a36..0afb2864879 100644 --- a/lisp/composite.el +++ b/lisp/composite.el @@ -532,9 +532,9 @@ after a sequence of character events." (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 @@ All non-spacing characters has this function in [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.