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

diff --git a/src/ChangeLog b/src/ChangeLog
index d1343b246ee3d18d12ef3841fae85e050fe8f91c..6cfb8bd3ed992a1b568aeef55697b7df1fe4ad52 100644 (file)
--- 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 846ba16d1ba8221ebbb0bd8d9a79a5897ccd6f98..51aca3e96705a0b62ba4a8c9a01e535df928aa6a 100644 (file)
--- 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);
     }