# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1149834513 0
# Node ID 15dda5f83c2723fe1f39ba5881bd13f82cdf5b04
# Parent  389f7c0d86969863450dec0801379f6353c710f0
(font_find_for_lface): Fix previous change.

diff -r 389f7c0d8696 -r 15dda5f83c27 src/font.c
--- a/src/font.c	Fri Jun 09 02:18:09 2006 +0000
+++ b/src/font.c	Fri Jun 09 06:28:33 2006 +0000
@@ -1728,7 +1728,7 @@
   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))