[Emacs-diffs] emacs/src ChangeLog frame.c

[Juanma Barranquero]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Juanma Barranquero <lektu>      09/09/24 16:59:16

Modified files:
        src            : ChangeLog frame.c 

Log message:
        * frame.c (xrdb_get_resource): Return nil for empty string resources;
          some parts of Emacs code (like font selection) don't grok them.  See
          http://lists.gnu.org/archive/html/emacs-devel/2009-09/msg00528.html

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7767&r2=1.7768
http://cvs.savannah.gnu.org/viewcvs/emacs/src/frame.c?cvsroot=emacs&r1=1.428&r2=1.429

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7767
retrieving revision 1.7768
diff -u -b -r1.7767 -r1.7768
--- ChangeLog   24 Sep 2009 08:18:40 -0000      1.7767
+++ ChangeLog   24 Sep 2009 16:59:14 -0000      1.7768
@@ -1,3 +1,9 @@
+2009-09-24  Juanma Barranquero  <address@hidden>
+
+       * frame.c (xrdb_get_resource): Return nil for empty string resources;
+       some parts of Emacs code (like font selection) don't grok them.  See
+       http://lists.gnu.org/archive/html/emacs-devel/2009-09/msg00528.html
+
 2009-09-24  Andreas Schwab  <address@hidden>
 
        * coding.c (decode_coding_iso_2022): Fix operator precedence.

Index: frame.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/frame.c,v
retrieving revision 1.428
retrieving revision 1.429
diff -u -b -r1.428 -r1.429
--- frame.c     17 Sep 2009 16:41:57 -0000      1.428
+++ frame.c     24 Sep 2009 16:59:16 -0000      1.429
@@ -3854,7 +3854,7 @@
 
   value = x_get_string_resource (rdb, name_key, class_key);
 
-  if (value != (char *) 0)
+  if (value != (char *) 0 && *value)
     return build_string (value);
   else
     return Qnil;