emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] master 833097c: Fix handling of -xrm on MS-Windows broken


From: Eli Zaretskii
Subject: [Emacs-diffs] master 833097c: Fix handling of -xrm on MS-Windows broken by recent commits
Date: Tue, 28 May 2019 12:59:16 -0400 (EDT)

branch: master
commit 833097cbc4856001ae77b33365faf09c1b3c30e3
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    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.
---
 src/w32reg.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/w32reg.c b/src/w32reg.c
index 844e561..99b3973 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)
 const char *
 w32_get_string_resource (void *v_rdb, const char *name, const char *class)
 {
-  const char *rdb = v_rdb;
+  const char *rdb = *(char **) v_rdb;
 
   if (rdb)
     {



reply via email to

[Prev in Thread] Current Thread [Next in Thread]