Mercurial > emacs

changeset 105182:e77a0b956835

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* 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
author Juanma Barranquero <lekktu@gmail.com>
date Thu, 24 Sep 2009 16:59:14 +0000
parents 5d1a87e2a233
children e7e9efa5ce16
files src/ChangeLog src/frame.c
diffstat 2 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Thu Sep 24 12:30:08 2009 +0000
+++ b/src/ChangeLog	Thu Sep 24 16:59:14 2009 +0000
@@ -1,3 +1,9 @@
+2009-09-24  Juanma Barranquero  <lekktu@gmail.com>
+
+	* 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  <schwab@redhat.com>
 
 	* coding.c (decode_coding_iso_2022): Fix operator precedence.
--- a/src/frame.c	Thu Sep 24 12:30:08 2009 +0000
+++ b/src/frame.c	Thu Sep 24 16:59:14 2009 +0000
@@ -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;