Mercurial > emacs
changeset 108068:c15cb68e177f
Fix Bug#6001.
* xsettings.c (read_and_apply_settings): Check if current_font is
NULL before strcmp (Bug#6001).
| author | Jan D. <jan.h.d@swipnet.se> |
|---|---|
| date | Thu, 22 Apr 2010 19:23:18 +0200 |
| parents | b0957e256d91 |
| children | c89b196107b3 |
| files | src/ChangeLog src/xsettings.c |
| diffstat | 2 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Thu Apr 22 09:37:58 2010 -0700 +++ b/src/ChangeLog Thu Apr 22 19:23:18 2010 +0200 @@ -1,3 +1,8 @@ +2010-04-22 Jan Djärv <jan.h.d@swipnet.se> + + * xsettings.c (read_and_apply_settings): Check if current_font is + NULL before strcmp (Bug#6001). + 2010-04-21 Dan Nicolaescu <dann@ics.uci.edu> Clean up HP-UX files.
--- a/src/xsettings.c Thu Apr 22 09:37:58 2010 -0700 +++ b/src/xsettings.c Thu Apr 22 19:23:18 2010 +0200 @@ -578,7 +578,7 @@ if (settings.seen & SEEN_FONT) { - if (strcmp (current_font, settings.font) != 0) + if (!current_font || strcmp (current_font, settings.font) != 0) { free (current_font); current_font = settings.font;