international/fontset.el (build-default-fontset-data): Exclude characters in scripts...

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e64fa66c49035bf38f2647c9f780da77f461fecc..ccafaf81928bf6a8d2f0f8bc27168a13247bbb59 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-08  Kenichi Handa  <handa@m17n.org>
+
+       * international/fontset.el (build-default-fontset-data): Exclude
+       characters in scripts kana, hangul, han, or cjk-misc.
+
 2010-01-06  Jan Djärv  <jan.h.d@swipnet.se>
 
        * font-setting.el (font-setting-change-default-font): Use user-spec

diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el
index 9b4a5d59ed404da6eac6031c6ae932450c0b01ee..1b45512fad659a7dc0938f72ed234bc5396b2f45 100644 (file)
--- a/lisp/international/fontset.el
+++ b/lisp/international/fontset.el
@@ -361,8 +361,10 @@
             (let ((from (car range)) (to (cdr range)))
               (if (< to #x110000)
                   (while (<= from to)
-                    (aset cjk-table from
-                          (logior (or (aref cjk-table from) 0) mask))
+                    (or (memq (aref char-script-table from)
+                              '(kana hangul han cjk-misc))
+                        (aset cjk-table from
+                              (logior (or (aref cjk-table from) 0) mask)))
                     (setq from (1+ from))))))
         (nth 1 elt) nil (nth 2 elt) (nth 3 elt)))
       (setq i (1+ i)))