# HG changeset patch # User Juanma Barranquero # Date 1046955692 0 # Node ID 479f0fd3607c70dabc56f09348320040b6a9c658 # Parent 8054c23b6726461c0703cdcd3b8619d75cc46cd0 (Fx_get_resource, x_get_resource_string): Pass xrdb to check for resources passed on the command line. diff -r 8054c23b6726 -r 479f0fd3607c src/w32fns.c --- 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. */