Mercurial > emacs

changeset 95471:6c85f5f5064c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(x_supports_face_attributes_p): Check face->font before comparing the properties.
author Kenichi Handa <handa@m17n.org>
date Mon, 02 Jun 2008 01:49:35 +0000
parents ca102559f762
children 47943f52839d
files src/xfaces.c
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/xfaces.c	Mon Jun 02 01:24:26 2008 +0000
+++ b/src/xfaces.c	Mon Jun 02 01:49:35 2008 +0000
@@ -5036,8 +5036,10 @@
       if (! face)
 	error ("Cannot make face");
 
-      /* If the font is the same, then not supported.  */
-      if (face->font == def_face->font)
+      /* If the font is the same, or no font is found, then not
+	 supported.  */
+      if (face->font == def_face->font
+	  || ! face->font)
 	return 0;
       for (i = FONT_TYPE_INDEX; i <= FONT_SIZE_INDEX; i++)
 	if (! EQ (face->font->props[i], def_face->font->props[i]))