From: Kenichi Handa <handa@m17n.org>
Date: Thu, 2 Apr 2009 02:45:01 +0000 (+0000)
Subject: (fontset_font): Record no-font when a fontset
X-Git-Tag: emacs-pretest-23.0.93~255
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=de0ad2f744d8d3feb4c5b8c5a3ba56c5472fbabb;p=emacs.git

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

diff --git a/src/fontset.c b/src/fontset.c
index f6c94f53e7e..6e2e34dac77 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -686,7 +686,7 @@ fontset_font (fontset, c, face, id)
   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 @@ fontset_font (fontset, c, face, id)
       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 @@ fontset_font (fontset, c, face, id)
   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 @@ fontset_font (fontset, c, face, id)
 	return rfont_def;
     }
 
+ no_font:
   /* Remember that we have no font for C.  */
   FONTSET_SET (fontset, make_number (c), Qt);