diff options
| author | Eli Zaretskii | 2011-07-24 01:30:09 -0400 |
|---|---|---|
| committer | Eli Zaretskii | 2011-07-24 01:30:09 -0400 |
| commit | f25e39b45a5960f8f2bff6c43f88833bc04540a9 (patch) | |
| tree | 62751905f5f766c555f19bd12d86cdeeb4a8317f /src/ChangeLog | |
| parent | 47f0b35ef3d1ac82846ba6e641ad783e0f378a6a (diff) | |
| download | emacs-f25e39b45a5960f8f2bff6c43f88833bc04540a9.tar.gz emacs-f25e39b45a5960f8f2bff6c43f88833bc04540a9.zip | |
Fix crash at startup under XASSERTS.
src/xfaces.c (check_lface_attrs) [HAVE_WINDOW_SYSTEM]: Allow `nil'
for attrs[LFACE_FONTSET_INDEX].
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index ba0e7cca4c4..e537848ea41 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2011-07-24 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * xfaces.c (check_lface_attrs) [HAVE_WINDOW_SYSTEM]: Allow `nil' | ||
| 4 | for attrs[LFACE_FONTSET_INDEX]. | ||
| 5 | |||
| 1 | 2011-07-23 Paul Eggert <eggert@cs.ucla.edu> | 6 | 2011-07-23 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 7 | ||
| 3 | * xml.c (parse_region): Remove unused local | 8 | * xml.c (parse_region): Remove unused local |