From: Kenichi Handa <handa@m17n.org>
Date: Fri, 9 Jun 2006 06:28:33 +0000 (+0000)
Subject: (font_find_for_lface): Fix previous change.
X-Git-Tag: emacs-pretest-23.0.90~8295^2~902
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e96b5f132a7a7762dc27f9a1fd6aadc459798f17;p=emacs.git

(font_find_for_lface): Fix previous change.
---

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))