From de0ad2f744d8d3feb4c5b8c5a3ba56c5472fbabb Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Thu, 2 Apr 2009 02:45:01 +0000 Subject: [PATCH] (fontset_font): Record no-font when a fontset explicitly tells not to try another font-specs. --- src/fontset.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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); -- 2.39.5