From bbbef9e18adbde3008878b9415a10c419d795089 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Fri, 15 Apr 2011 19:49:21 -0700 Subject: [PATCH] * xterm.c (x_term_init): Remove local to avoid shadowing. --- src/ChangeLog | 1 + src/xterm.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index 4b6fc4fb37c..8ee4239d0af 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,6 +1,7 @@ 2011-04-16 Paul Eggert * xterm.c (x_alloc_nearest_color_for_widget): Remove; unused. + (x_term_init): Remove local to avoid shadowing. * xfns.c, xterm.c (_XEditResCheckMessages): Protoize decl. diff --git a/src/xterm.c b/src/xterm.c index 1a956ee7135..e0f38aab2c2 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -10260,10 +10260,10 @@ x_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name) #ifdef USE_LUCID { - Display *dpy = dpyinfo->display; XrmValue d, fr, to; Font font; + dpy = dpyinfo->display; d.addr = (XPointer)&dpy; d.size = sizeof (Display *); fr.addr = XtDefaultFont; -- 2.39.2