* xterm.c (x_term_init): Remove local to avoid shadowing.

diff --git a/src/ChangeLog b/src/ChangeLog
index 4b6fc4fb37c233c87fe800b5ff560ee9bbbee67a..8ee4239d0afad12ae5a5f60d1b76bb756ccabdc4 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,6 +1,7 @@
 2011-04-16  Paul Eggert  <eggert@cs.ucla.edu>
 
        * 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 1a956ee71352f4e02fc85edc1c686ba0b86b0a14..e0f38aab2c2cc69bd3b4abeeeeb4837dedd1f483 100644 (file)
--- 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;