changeset 101605:b37403eedfa9

(font_for_char): Use assq_no_quit, not assoc_no_quit. (fontset_get_font_group): Remember that no font-group is specified for C.
author Kenichi Handa <handa@m17n.org>
date Wed, 28 Jan 2009 11:50:05 +0000
parents 8eb53d4d4b78
children 7e8c2c1eb8b8
files src/fontset.c
diffstat 1 files changed, 11 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/fontset.c	Wed Jan 28 09:38:42 2009 +0000
+++ b/src/fontset.c	Wed Jan 28 11:50:05 2009 +0000
@@ -89,7 +89,8 @@
    An element of a base fontset is a vector of FONT-DEFs which itself
    is a vector [ FONT-SPEC ENCODING REPERTORY ].
 
-   An element of a realized fontset is nil, t, or a vector of this form:
+   An element of a realized fontset is nil, t, 0, or a vector of this
+   form:
 
 	[ CHARSET-ORDERED-LIST-TICK PREFERRED-RFONT-DEF
 	  RFONT-DEF0 RFONT-DEF1 ... ]
@@ -107,6 +108,10 @@
    The value t means that no font is available for the corresponding
    range of characters.
 
+   The value 0 means that no font is available for the corresponding
+   range of characters in this fontset, but may be available in the
+   default fontset.
+
 
    A fontset has 9 extra slots.
 
@@ -474,7 +479,11 @@
   else
     font_group = FONTSET_FALLBACK (base_fontset);
   if (NILP (font_group))
-    return Qnil;
+    {
+      if (c >= 0)
+	char_table_set_range (fontset, from, to, make_number (0));
+      return Qnil;
+    }
   font_group = Fcopy_sequence (font_group);
   for (i = 0; i < ASIZE (font_group); i++)
     if (! NILP (AREF (font_group, i)))