From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 16 Apr 2011 20:07:17 +0000 (-0700)
Subject: * xfns.c (Fx_file_dialog): Rename local to avoid shadowing.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~268^2~24
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=91a3e27bb7ee79474b8b470b3b8d755f92e5721f;p=emacs.git

* xfns.c (Fx_file_dialog): Rename local to avoid shadowing.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index d1343b246ee..6cfb8bd3ed9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2011-04-16  Paul Eggert  <eggert@cs.ucla.edu>
 
+	* xfns.c (Fx_file_dialog): Rename local to avoid shadowing.
+
 	* xdisp.c (x_produce_glyphs): Avoid possibly-uninitialized var.
 
 	* xfns.c (x_real_positions): Mark locals as initialized.
diff --git a/src/xfns.c b/src/xfns.c
index 846ba16d1ba..51aca3e9670 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -5462,12 +5462,12 @@ Otherwise, if ONLY-DIR-P is non-nil, the user can only select directories.  */)
   /* Get the result.  */
   if (result == XmCR_OK)
     {
-      XmString text;
+      XmString text_string;
       String data;
 
-      XtVaGetValues (dialog, XmNtextString, &text, NULL);
-      XmStringGetLtoR (text, XmFONTLIST_DEFAULT_TAG, &data);
-      XmStringFree (text);
+      XtVaGetValues (dialog, XmNtextString, &text_string, NULL);
+      XmStringGetLtoR (text_string, XmFONTLIST_DEFAULT_TAG, &data);
+      XmStringFree (text_string);
       file = build_string (data);
       XtFree (data);
     }