[Emacs-diffs] emacs/src fontset.c

[Kenichi Handa]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Kenichi Handa <handa>   09/04/02 02:45:01

Modified files:
        src            : fontset.c 

Log message:
        (fontset_font): Record no-font when a fontset
        explicitly tells not to try another font-specs.

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

Patches:
Index: fontset.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/fontset.c,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -b -r1.166 -r1.167
--- fontset.c   30 Mar 2009 12:50:50 -0000      1.166
+++ fontset.c   2 Apr 2009 02:45:01 -0000       1.167
@@ -686,7 +686,7 @@
   if (VECTORP (rfont_def))
     return rfont_def;
   if (EQ (rfont_def, Qt))
-    return Qnil;
+    goto no_font;
 
   /* Try a font-group of the default fontset. */
   base_fontset = FONTSET_BASE (fontset);
@@ -699,7 +699,7 @@
       if (VECTORP (rfont_def))
        return rfont_def;
       if (EQ (rfont_def, Qt))
-       return Qnil;
+       goto no_font;
     }
 
   /* Try a fallback font-group of FONTSET. */
@@ -707,7 +707,7 @@
   if (VECTORP (rfont_def))
     return rfont_def;
   if (EQ (rfont_def, Qt))
-    return Qnil;
+    goto no_font;
 
   /* Try a fallback font-group of the default fontset . */
   if (! EQ (base_fontset, Vdefault_fontset))
@@ -717,6 +717,7 @@
        return rfont_def;
     }
 
+ no_font:
   /* Remember that we have no font for C.  */
   FONTSET_SET (fontset, make_number (c), Qt);