diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2011-07-24 01:30:09 -0400 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2011-07-24 01:30:09 -0400 |
| commit | f25e39b45a5960f8f2bff6c43f88833bc04540a9 (patch) | |
| tree | 62751905f5f766c555f19bd12d86cdeeb4a8317f | |
| parent | 47f0b35ef3d1ac82846ba6e641ad783e0f378a6a (diff) | |
| download | emacs-f25e39b45a5960f8f2bff6c43f88833bc04540a9.tar.gz | |
Fix crash at startup under XASSERTS.
src/xfaces.c (check_lface_attrs) [HAVE_WINDOW_SYSTEM]: Allow `nil'
for attrs[LFACE_FONTSET_INDEX].
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/xfaces.c | 3 |
2 files changed, 7 insertions, 1 deletions
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 } |