Mercurial > emacs

diff src/font.c @ 95013:125a7ecf00db

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(font_find_for_lface): Reflect LFACE_FONT in the font preference.
author Kenichi Handa <handa@m17n.org>
date Thu, 15 May 2008 10:29:19 +0000
parents e87ef440216b
children ae4280e6a166
line wrap: on
line diff
--- a/src/font.c	Thu May 15 08:13:55 2008 +0000
+++ b/src/font.c	Thu May 15 10:29:19 2008 +0000
@@ -2780,6 +2780,14 @@
       double pt;
       for (i = 0; i < FONT_EXTRA_INDEX; i++)
 	ASET (prefer, i, AREF (spec, i));
+      if (FONTP (attrs[LFACE_FONT_INDEX]))
+	{
+	  Lisp_Object face_font = attrs[LFACE_FONT_INDEX];
+
+	  for (i = 0; i < FONT_EXTRA_INDEX; i++)
+	    if (NILP (AREF (prefer, i)))
+	      ASET (prefer, i, AREF (face_font, i));
+	}
       if (NILP (AREF (prefer, FONT_FAMILY_INDEX)))
 	font_parse_family_registry (attrs[LFACE_FAMILY_INDEX], Qnil, prefer);
       if (NILP (AREF (prefer, FONT_WEIGHT_INDEX)))