Commit e5af3c25 authored by Juanma Barranquero's avatar Juanma Barranquero

(Fx_get_resource, x_get_resource_string): Pass xrdb to check for resources

passed on the command line.
parent c13a8a91
...@@ -3073,7 +3073,7 @@ and the class is `Emacs.CLASS.SUBCLASS'. */) ...@@ -3073,7 +3073,7 @@ and the class is `Emacs.CLASS.SUBCLASS'. */)
strcat (name_key, "."); strcat (name_key, ".");
strcat (name_key, SDATA (attribute)); 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); name_key, class_key);
if (value != (char *) 0) if (value != (char *) 0)
...@@ -3104,7 +3104,8 @@ x_get_resource_string (attribute, class) ...@@ -3104,7 +3104,8 @@ x_get_resource_string (attribute, class)
attribute); attribute);
sprintf (class_key, "%s.%s", EMACS_CLASS, class); 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. */ /* Types we might convert a resource string into. */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment