# HG changeset patch
# User Kenichi Handa <handa@etlken>
# Date 1274232400 -32400
# Node ID 194ff305ac3f8c3ba534ec1bd5b0d242946c0832
# Parent  1e3c6cb46d2a25b11ace7672dac77782af0fd35b# Parent  452cd1d4f5ad551901ed7f675b58c2eb2f9199dc
composite.el: Register compose-gstring-for-graphic in composition-function-table only for combining characters (Mn, Mc, Me).

diff -r 1e3c6cb46d2a -r 194ff305ac3f lisp/ChangeLog
--- 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)
diff -r 1e3c6cb46d2a -r 194ff305ac3f lisp/composite.el
--- 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.