procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix crash at startup under XASSERTS.

Browse source 
src/xfaces.c (check_lface_attrs) [HAVE_WINDOW_SYSTEM]: Allow `nil'
 for attrs[LFACE_FONTSET_INDEX].
This commit is contained in:
Eli Zaretskii 2011-07-24 01:30:09 -04:00
parent 47f0b35ef3
commit f25e39b45a
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -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

3
src/xfaces.c
View file

@ -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
}