Commit f25e39b4 authored by Eli Zaretskii's avatar Eli Zaretskii
Browse files

Fix crash at startup under XASSERTS.

 src/xfaces.c (check_lface_attrs) [HAVE_WINDOW_SYSTEM]: Allow `nil'
 for attrs[LFACE_FONTSET_INDEX].
parent 47f0b35e
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> 2011-07-23 Paul Eggert <eggert@cs.ucla.edu>
* xml.c (parse_region): Remove unused local * xml.c (parse_region): Remove unused local
......
...@@ -1918,7 +1918,8 @@ check_lface_attrs (Lisp_Object *attrs) ...@@ -1918,7 +1918,8 @@ check_lface_attrs (Lisp_Object *attrs)
|| IGNORE_DEFFACE_P (attrs[LFACE_FONT_INDEX]) || IGNORE_DEFFACE_P (attrs[LFACE_FONT_INDEX])
|| FONTP (attrs[LFACE_FONT_INDEX])); || FONTP (attrs[LFACE_FONT_INDEX]));
xassert (UNSPECIFIEDP (attrs[LFACE_FONTSET_INDEX]) xassert (UNSPECIFIEDP (attrs[LFACE_FONTSET_INDEX])
|| STRINGP (attrs[LFACE_FONTSET_INDEX])); || STRINGP (attrs[LFACE_FONTSET_INDEX])
|| NILP (attrs[LFACE_FONTSET_INDEX]));
#endif #endif
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment