[Emacs-diffs] emacs/src fontset.c

[Kenichi Handa]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Kenichi Handa <handa>   09/01/28 11:50:06

Modified files:
        src            : fontset.c 

Log message:
        (font_for_char): Use assq_no_quit, not assoc_no_quit.
        (fontset_get_font_group): Remember that no font-group is specified
        for C.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/fontset.c?cvsroot=emacs&r1=1.154&r2=1.155

Patches:
Index: fontset.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/fontset.c,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -b -r1.154 -r1.155
--- fontset.c   28 Jan 2009 06:44:53 -0000      1.154
+++ fontset.c   28 Jan 2009 11:50:05 -0000      1.155
@@ -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))
+    {
+      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)))