Mercurial > emacs

changeset 50039:479f0fd3607c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(Fx_get_resource, x_get_resource_string): Pass xrdb to check for resources passed on the command line.
author Juanma Barranquero <lekktu@gmail.com>
date Thu, 06 Mar 2003 13:01:32 +0000
parents 8054c23b6726
children 57e262ca5d0d
files src/w32fns.c
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/w32fns.c	Thu Mar 06 13:00:04 2003 +0000
+++ b/src/w32fns.c	Thu Mar 06 13:01:32 2003 +0000
@@ -3073,7 +3073,7 @@
   strcat (name_key, ".");
   strcat (name_key, SDATA (attribute));
 
-  value = x_get_string_resource (Qnil,
+  value = x_get_string_resource (check_x_display_info (Qnil)->xrdb,
 				 name_key, class_key);
 
   if (value != (char *) 0)
@@ -3104,7 +3104,8 @@
 	   attribute);
   sprintf (class_key, "%s.%s", EMACS_CLASS, class);
 
-  return x_get_string_resource (sf, name_key, class_key);
+  return x_get_string_resource (FRAME_X_DISPLAY_INFO (sf)->xrdb,
+				name_key, class_key);
 }
 
 /* Types we might convert a resource string into.  */