[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r105315: Fix crash at startup under X
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r105315: Fix crash at startup under XASSERTS. |
Date: |
Sun, 24 Jul 2011 01:30:09 -0400 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
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
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r105315: Fix crash at startup under XASSERTS.,
Eli Zaretskii <=