(compose-gstring-for-terminal): For zero-width

characters of Unicode category `Cf', simply replace it with SPC.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b73049a110191efbb56d70bdda65b0fe916283e7..cfab7c2065ea3f106aef1cde0d25c54fe5d95eea 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-10  Kenichi Handa  <handa@m17n.org>
+
+       * composite.el (compose-gstring-for-terminal): For zero-width
+       characters of Unicode category `Cf', simply replace it with SPC.
+
 2009-06-09  Agustín Martín <agustin.martin@hispalinux.es>
 
        * ispell.el: Make `ispell-dictionary' customizable (#2555)

diff --git a/lisp/composite.el b/lisp/composite.el
index d3c000fe8395caefd38b92e423b76e8203d41acf..ce34336cedec59143bf0cd0c24762a0b8d6054bb 100644 (file)
--- a/lisp/composite.el
+++ b/lisp/composite.el
@@ -681,7 +681,14 @@ a prepending a space before it."
              (lglyph-set-from-to glyph i i)
              (setq i (1+ i))))
        (if (= (lglyph-width glyph) 0)
-           (progn
+           (if (eq (get-char-code-property (lglyph-char glyph)
+                                           'general-category)
+                   'Cf)
+               (progn
+                 ;; Compose by replacing with a space.
+                 (lglyph-set-char glyph 32)
+                 (lglyph-set-width glyph 1)
+                 (setq i (1+ i)))
              ;; Compose by prepending a space.
              (setq gstring (lgstring-insert-glyph gstring i
                                                   (lglyph-copy glyph))