From: Kenichi Handa <handa@m17n.org>
Date: Mon, 2 Jun 2008 01:49:47 +0000 (+0000)
Subject: (x_supports_face_attributes_p): Check face->font before
X-Git-Tag: emacs-pretest-23.0.90~5165
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4fc1984a7e02d0bcfcf252ae323b0741ef293f26;p=emacs.git

(x_supports_face_attributes_p): Check face->font before
comparing the properties.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index c6aab2c264e..dc54ddaddd9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-02  Kenichi Handa  <handa@m17n.org>
+
+	* xfaces.c (x_supports_face_attributes_p): Check face->font before
+	comparing the properties.
+
 2008-06-01  Jason Rumney  <jasonr@gnu.org>
 
         * w32font.c (w32_enumfont_pattern_entity): Use requested registry.
diff --git a/src/xfaces.c b/src/xfaces.c
index 074b71b13c1..2b85cfb6605 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -5036,8 +5036,10 @@ x_supports_face_attributes_p (f, attrs, def_face)
       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]))