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 ba0e7cca4c4a939a978061f0ac02c3af1835bd58..e537848ea412d8b051bfd27d510349100b8e07f1 100644 (file)
--- 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 c1e75ab3e597d0e053babe54bd8c60f451601a09..32729ce6f8d1ed6001b6e0b418dcc2603037564e 100644 (file)
--- 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
 }