From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 16 Apr 2011 02:49:21 +0000 (-0700)
Subject: * xterm.c (x_term_init): Remove local to avoid shadowing.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~268^2~50
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bbbef9e18adbde3008878b9415a10c419d795089;p=emacs.git

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

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  <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 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;