[Emacs-diffs] /srv/bzr/emacs/trunk r105315: Fix crash at startup under XASSERTS.

[Eli Zaretskii]

------------------------------------------------------------
revno: 105315
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sun 2011-07-24 01:30:09 -0400
message:
  Fix crash at startup under XASSERTS.
  
   src/xfaces.c (check_lface_attrs) [HAVE_WINDOW_SYSTEM]: Allow `nil'
   for attrs[LFACE_FONTSET_INDEX].
modified:
  src/ChangeLog
  src/xfaces.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-07-23 18:31:25 +0000
+++ b/src/ChangeLog     2011-07-24 05:30:09 +0000
@@ -1,3 +1,8 @@
+2011-07-24  Eli Zaretskii  <address@hidden>
+
+       * xfaces.c (check_lface_attrs) [HAVE_WINDOW_SYSTEM]: Allow `nil'
+       for attrs[LFACE_FONTSET_INDEX].
+
 2011-07-23  Paul Eggert  <address@hidden>
 
        * xml.c (parse_region): Remove unused local

=== modified file 'src/xfaces.c'
--- a/src/xfaces.c      2011-07-10 08:20:10 +0000
+++ b/src/xfaces.c      2011-07-24 05:30:09 +0000
@@ -1918,7 +1918,8 @@
           || 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
 }