Mercurial > emacs

changeset 102814:2e48aa14234d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(fontset_font): Record no-font when a fontset explicitly tells not to try another font-specs.
author Kenichi Handa <handa@m17n.org>
date Thu, 02 Apr 2009 02:45:01 +0000
parents 2c37faeb7d5e
children 71a9716c3fc1
files src/fontset.c
diffstat 1 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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);