(setup-default-fontset): Specify

iso10646-1 font for characters in PUA of BMP.

3 files changed, 15 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7297dac77ee..d5751cf1422 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-02  Kenichi Handa  <handa@m17n.org>
+
+        * international/fontset.el (setup-default-fontset): Specify
+        iso10646-1 font for characters in PUA of BMP.
+
 2009-04-02  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * simple.el (auto-fill-function): Mark it as safe for nil.
diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el
index cbf53ffe057..103cfccc611 100644
--- a/lisp/international/fontset.el
+++ b/lisp/international/fontset.el
@@ -578,7 +578,11 @@
   (set-fontset-font "fontset-default" '(#x20000 . #x2FFFF)
                     '(nil . "unicode-sip"))
 
-  (set-fontset-font "fontset-default" '(#xE000 . #xF8FF) nil))
+  (set-fontset-font "fontset-default" '(#xE000 . #xF8FF)
+                    '(nil . "iso10646-1"))
+  ;; Don't try the fallback fonts even if no suitable font was found
+  ;; by the above font-spec.
+  (set-fontset-font "fontset-default" '(#xE000 . #xF8FF) nil nil 'append))
 
 (defun create-default-fontset ()
   "Create the default fontset.
diff --git a/src/ChangeLog b/src/ChangeLog
index 146edf9429a..1b2af1639ea 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-02  Kenichi Handa  <handa@m17n.org>
+
+        * fontset.c (fontset_font): Record no-font when a fontset
+        explicitly tells not to try another font-specs.
+
 2009-03-30  Pierre Poissinger  <pierre.poissinger@gmail.com>  (tiny change)
 
         * charset.c (map_charset_for_dump): Add missing UNGCPRO.