# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1201260387 0
# Node ID 9673276f310c53cbfeafb7acbb76f86f39070c0d
# Parent  5148dc1ed8c3739c857ebbab1cb268a40a7fb8f1
(font_load_for_face): Handle the case that the font in
face->lface is a string.

diff -r 5148dc1ed8c3 -r 9673276f310c src/font.c
--- a/src/font.c	Wed Jan 23 11:14:47 2008 +0000
+++ b/src/font.c	Fri Jan 25 11:26:27 2008 +0000
@@ -2753,6 +2753,10 @@
       if (! NILP (entity))
 	font_object = font_open_for_lface (f, entity, face->lface, Qnil);
     }
+  else if (STRINGP (font_object))
+    {
+      font_object = font_open_by_name (f, SDATA (font_object));
+    }
 
   if (! NILP (font_object))
     {