Mercurial > emacs
changeset 106927:6d51d2e8c691
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Fri, 08 Jan 2010 02:43:41 +0000 |
| parents | 14f1e1d97396 (current diff) 28260028067c (diff) |
| children | ab59a02f9f9a |
| files | |
| diffstat | 2 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Thu Jan 07 23:49:52 2010 +0000 +++ b/lisp/ChangeLog Fri Jan 08 02:43:41 2010 +0000 @@ -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-07 Juanma Barranquero <lekktu@gmail.com> * vc-dir.el (vc-dir-prepare-status-buffer): Pass a (fake) filename
--- a/lisp/international/fontset.el Thu Jan 07 23:49:52 2010 +0000 +++ b/lisp/international/fontset.el Fri Jan 08 02:43:41 2010 +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)))