diff options
| author | Juanma Barranquero | 2003-03-06 13:01:32 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2003-03-06 13:01:32 +0000 |
| commit | e5af3c25c972a28df90fa48aa9a121a8c2cb7e61 (patch) | |
| tree | 2226e4a6c6eae7c98d9efd7fafe6a85a7f383fa5 /src | |
| parent | c13a8a91d70ee03182bf0a4deb47a58749680606 (diff) | |
| download | emacs-e5af3c25c972a28df90fa48aa9a121a8c2cb7e61.tar.gz emacs-e5af3c25c972a28df90fa48aa9a121a8c2cb7e61.zip | |
(Fx_get_resource, x_get_resource_string): Pass xrdb to check for resources
passed on the command line.
Diffstat (limited to 'src')
| -rw-r--r-- | src/w32fns.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/w32fns.c b/src/w32fns.c index dfe11442ea8..190ff15733b 100644 --- a/src/w32fns.c +++ b/src/w32fns.c | |||
| @@ -3073,7 +3073,7 @@ and the class is `Emacs.CLASS.SUBCLASS'. */) | |||
| 3073 | strcat (name_key, "."); | 3073 | strcat (name_key, "."); |
| 3074 | strcat (name_key, SDATA (attribute)); | 3074 | strcat (name_key, SDATA (attribute)); |
| 3075 | 3075 | ||
| 3076 | value = x_get_string_resource (Qnil, | 3076 | value = x_get_string_resource (check_x_display_info (Qnil)->xrdb, |
| 3077 | name_key, class_key); | 3077 | name_key, class_key); |
| 3078 | 3078 | ||
| 3079 | if (value != (char *) 0) | 3079 | if (value != (char *) 0) |
| @@ -3104,7 +3104,8 @@ x_get_resource_string (attribute, class) | |||
| 3104 | attribute); | 3104 | attribute); |
| 3105 | sprintf (class_key, "%s.%s", EMACS_CLASS, class); | 3105 | sprintf (class_key, "%s.%s", EMACS_CLASS, class); |
| 3106 | 3106 | ||
| 3107 | return x_get_string_resource (sf, name_key, class_key); | 3107 | return x_get_string_resource (FRAME_X_DISPLAY_INFO (sf)->xrdb, |
| 3108 | name_key, class_key); | ||
| 3108 | } | 3109 | } |
| 3109 | 3110 | ||
| 3110 | /* Types we might convert a resource string into. */ | 3111 | /* Types we might convert a resource string into. */ |