# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1238640301 0
# Node ID 2e48aa14234d1f2d7c0d213ac26c9a2c10c5325a
# Parent  2c37faeb7d5e74a7329b91481b22d548cfc65df8
(fontset_font): Record no-font when a fontset
explicitly tells not to try another font-specs.

diff -r 2c37faeb7d5e -r 2e48aa14234d src/fontset.c
--- a/src/fontset.c	Thu Apr 02 01:56:43 2009 +0000
+++ b/src/fontset.c	Thu Apr 02 02:45:01 2009 +0000
@@ -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);