Commit de0ad2f7 authored by Kenichi Handa's avatar Kenichi Handa
Browse files

(fontset_font): Record no-font when a fontset

explicitly tells not to try another font-specs.
parent 74ab01ff
......@@ -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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment