Mercurial > emacs

changeset 90448:15dda5f83c27

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(font_find_for_lface): Fix previous change.
author Kenichi Handa <handa@m17n.org>
date Fri, 09 Jun 2006 06:28:33 +0000
parents 389f7c0d8696
children 5956a1352bc4
files src/font.c
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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))