[Emacs-diffs] /srv/bzr/emacs/trunk r99274: international/fontset.el (build-default-fontset-data): Exclude characters in scripts kana, hangul, han, or cjk-misc.

[Kenichi Handa]

------------------------------------------------------------
revno: 99274 [merge]
committer: Kenichi Handa  <address@hidden>
branch nick: trunk
timestamp: Fri 2010-01-08 10:54:58 +0900
message:
  international/fontset.el (build-default-fontset-data): Exclude characters in 
scripts kana, hangul, han, or cjk-misc.
modified:
  lisp/ChangeLog
  lisp/international/fontset.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-01-07 22:46:44 +0000
+++ b/lisp/ChangeLog    2010-01-08 01:53:29 +0000
@@ -1,3 +1,8 @@
+2010-01-08  Kenichi Handa  <address@hidden>
+
+       * international/fontset.el (build-default-fontset-data): Exclude
+       characters in scripts kana, hangul, han, or cjk-misc.
+
 2010-01-07  Juanma Barranquero  <address@hidden>
 
        * vc-dir.el (vc-dir-prepare-status-buffer): Pass a (fake) filename

=== modified file 'lisp/international/fontset.el'
--- a/lisp/international/fontset.el     2010-01-04 05:35:18 +0000
+++ b/lisp/international/fontset.el     2010-01-08 01:46:22 +0000
@@ -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)))