aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/fontset.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/fontset.c b/src/fontset.c
index 983f4f0d044..cd375683083 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -521,7 +521,7 @@ fontset_find_font (fontset, c, face, id, fallback)
521 521
522 font_group = fontset_get_font_group (fontset, fallback ? -1 : c); 522 font_group = fontset_get_font_group (fontset, fallback ? -1 : c);
523 if (! CONSP (font_group)) 523 if (! CONSP (font_group))
524 return Qnil; 524 return font_group;
525 vec = XCDR (font_group); 525 vec = XCDR (font_group);
526 if (ASIZE (vec) == 0) 526 if (ASIZE (vec) == 0)
527 return Qnil; 527 return Qnil;
@@ -660,10 +660,6 @@ fontset_font (fontset, c, face, id)
660 Lisp_Object rfont_def; 660 Lisp_Object rfont_def;
661 Lisp_Object base_fontset; 661 Lisp_Object base_fontset;
662 662
663 /* If we know there is no font of C, don't do any work. */
664 if (EQ (fontset_ref (fontset, c), Qt))
665 return Qnil;
666
667 /* Try a font-group of FONTSET. */ 663 /* Try a font-group of FONTSET. */
668 rfont_def = fontset_find_font (fontset, c, face, id, 0); 664 rfont_def = fontset_find_font (fontset, c, face, id, 0);
669 if (VECTORP (rfont_def)) 665 if (VECTORP (rfont_def))