[Emacs-diffs] /srv/bzr/emacs/trunk r100357: composite.el: Register compose-gstring-for-graphic in composition-function-table only for combining characters (Mn, Mc, Me).

[Kenichi Handa]

------------------------------------------------------------
revno: 100357 [merge]
committer: Kenichi Handa <address@hidden>
branch nick: trunk
timestamp: Wed 2010-05-19 10:26:40 +0900
message:
  composite.el: Register compose-gstring-for-graphic in 
composition-function-table only for combining characters (Mn, Mc, Me).
modified:
  lisp/ChangeLog
  lisp/composite.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-05-18 22:49:56 +0000
+++ b/lisp/ChangeLog    2010-05-19 01:16:01 +0000
@@ -1,3 +1,9 @@
+2010-05-19  Kenichi Handa  <address@hidden>
+
+       * composite.el: Register compose-gstring-for-graphic in
+       composition-function-table only for combining characters (Mn, Mc,
+       Me).
+
 2010-05-18  Jay Belanger  <address@hidden>
 
        * calc/calc-trail.el (calc-trail-isearch-forward)

=== modified file 'lisp/composite.el'
--- a/lisp/composite.el 2010-05-08 18:47:07 +0000
+++ b/lisp/composite.el 2010-05-19 01:09:50 +0000
@@ -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.