From e96b5f132a7a7762dc27f9a1fd6aadc459798f17 Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Fri, 9 Jun 2006 06:28:33 +0000 Subject: [PATCH] (font_find_for_lface): Fix previous change. --- src/font.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/font.c b/src/font.c index 9c8f37c01f9..6f6e7f5d096 100644 --- a/src/font.c +++ b/src/font.c @@ -1728,7 +1728,7 @@ font_find_for_lface (f, lface, spec) for (i = FONT_FOUNDRY_INDEX; i <= FONT_SIZE_INDEX; i++) try_unspecified[i] = NILP (AREF (scratch_font_spec, i)); - if (STRINGP (attrs[LFACE_FONT_INDEX])) + if (NILP (spec) && STRINGP (attrs[LFACE_FONT_INDEX])) font_merge_old_spec (attrs[LFACE_FONT_INDEX], Qnil, Qnil, scratch_font_spec); if (NILP (AREF (scratch_font_spec, FONT_FAMILY_INDEX)) -- 2.39.5