diff options
| author | Kenichi Handa <[email protected]> | 2009-04-02 02:45:01 +0000 |
|---|---|---|
| committer | Kenichi Handa <[email protected]> | 2009-04-02 02:45:01 +0000 |
| commit | de0ad2f744d8d3feb4c5b8c5a3ba56c5472fbabb (patch) | |
| tree | 7431a2afb6fdf3cb313f2f58e49f5bcbbb3dea29 | |
| parent | 74ab01ffd8382d9112aa364b489b6fb84248f68b (diff) | |
(fontset_font): Record no-font when a fontset
explicitly tells not to try another font-specs.
| -rw-r--r-- | src/fontset.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/fontset.c b/src/fontset.c index f6c94f53e7..6e2e34dac7 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); |