From: Kenichi Handa <handa@m17n.org>
Date: Fri, 25 Jan 2008 11:26:27 +0000 (+0000)
Subject: (font_load_for_face): Handle the case that the font in
X-Git-Tag: emacs-pretest-23.0.90~8295^2~24
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c8ea71f6869bbb2fb4dee9ab74da81c497f2e799;p=emacs.git

(font_load_for_face): Handle the case that the font in
face->lface is a string.
---

diff --git a/src/font.c b/src/font.c
index f9097d1f064..1e95315bdaf 100644
--- a/src/font.c
+++ b/src/font.c
@@ -2753,6 +2753,10 @@ font_load_for_face (f, face)
       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))
     {