# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1210847359 0
# Node ID 125a7ecf00db841b64c84fad1662cdf04981fd88
# Parent  b7d2d8c580a80d68ae6f0d58bbdc77f878e3906b
(font_find_for_lface): Reflect LFACE_FONT in the font
preference.

diff -r b7d2d8c580a8 -r 125a7ecf00db src/font.c
--- 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)))