From: Eli Zaretskii <eliz@gnu.org>
Date: Sun, 24 Jul 2011 05:30:09 +0000 (-0400)
Subject: Fix crash at startup under XASSERTS.
X-Git-Tag: emacs-pretest-24.0.90~104^2~166
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f25e39b45a5960f8f2bff6c43f88833bc04540a9;p=emacs.git

Fix crash at startup under XASSERTS.

 src/xfaces.c (check_lface_attrs) [HAVE_WINDOW_SYSTEM]: Allow `nil'
 for attrs[LFACE_FONTSET_INDEX].
---

diff --git a/src/ChangeLog b/src/ChangeLog
index ba0e7cca4c4..e537848ea41 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-24  Eli Zaretskii  <eliz@gnu.org>
+
+	* xfaces.c (check_lface_attrs) [HAVE_WINDOW_SYSTEM]: Allow `nil'
+	for attrs[LFACE_FONTSET_INDEX].
+
 2011-07-23  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* xml.c (parse_region): Remove unused local
diff --git a/src/xfaces.c b/src/xfaces.c
index c1e75ab3e59..32729ce6f8d 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -1918,7 +1918,8 @@ check_lface_attrs (Lisp_Object *attrs)
 	   || IGNORE_DEFFACE_P (attrs[LFACE_FONT_INDEX])
 	   || FONTP (attrs[LFACE_FONT_INDEX]));
   xassert (UNSPECIFIEDP (attrs[LFACE_FONTSET_INDEX])
-	   || STRINGP (attrs[LFACE_FONTSET_INDEX]));
+	   || STRINGP (attrs[LFACE_FONTSET_INDEX])
+	   || NILP (attrs[LFACE_FONTSET_INDEX]));
 #endif
 }