Mercurial > emacs

diff src/xsettings.c @ 108068:c15cb68e177f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 c10fc3731b2c
children c9cc3dd13301
line wrap: on
line diff
--- 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;