aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2019-05-28 19:58:27 +0300
committerEli Zaretskii2019-05-31 11:32:48 +0300
commitec8e914c8155eced1ea7a2c643aef257395c4a72 (patch)
tree9a2f46ffea00359ffbe095dfffddba9231029cb7 /src
parent2ffec6b48e282fd7b25c6ebf31c05ac6b75ff6ac (diff)
downloademacs-ec8e914c8155eced1ea7a2c643aef257395c4a72.tar.gz
emacs-ec8e914c8155eced1ea7a2c643aef257395c4a72.zip
Fix handling of -xrm on MS-Windows broken by recent commits
* src/w32reg.c (w32_get_string_resource): The argument V_RDB is a 'char **', not a 'char *'. This fixes -xrm handling on MS-Windows, broken by conversion of x_get_string_resource to terminal-specific hook. (cherry picked from commit 833097cbc4856001ae77b33365faf09c1b3c30e3)
Diffstat (limited to 'src')
-rw-r--r--src/w32reg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/w32reg.c b/src/w32reg.c
index 844e5613770..99b3973d708 100644
--- a/src/w32reg.c
+++ b/src/w32reg.c
@@ -143,7 +143,7 @@ w32_get_string_resource_1 (const char *name, const char *class, DWORD dwexptype)
143const char * 143const char *
144w32_get_string_resource (void *v_rdb, const char *name, const char *class) 144w32_get_string_resource (void *v_rdb, const char *name, const char *class)
145{ 145{
146 const char *rdb = v_rdb; 146 const char *rdb = *(char **) v_rdb;
147 147
148 if (rdb) 148 if (rdb)
149 { 149 {