Mercurial > emacs

changeset 91350:9673276f310c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(font_load_for_face): Handle the case that the font in face->lface is a string.
author Kenichi Handa <handa@m17n.org>
date Fri, 25 Jan 2008 11:26:27 +0000
parents 5148dc1ed8c3
children 59430a24e715
files src/font.c
diffstat 1 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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))
     {