* xfns.c (x_window): Rename locals to avoid shadowing.

diff --git a/src/ChangeLog b/src/ChangeLog
index 5bf84ff11d195a12b4e49d03a7df7c3dcd6753e5..fe12999e45537692c6f229611a40010a0d37f845 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,6 +1,7 @@
 2011-04-16  Paul Eggert  <eggert@cs.ucla.edu>
 
        * xfns.c (free_frame_menubar, atof): Remove duplicate decls.
+       (x_window): Rename locals to avoid shadowing.
 
        * xterm.c (x_alloc_nearest_color_for_widget): Remove; unused.
        (x_term_init): Remove local to avoid shadowing.

diff --git a/src/xfns.c b/src/xfns.c
index f473541f05cae84ef991729857c33855cc4b941d..3d17f22be6362071392e4f10924c71a377fa72aa 100644 (file)
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -2427,8 +2427,8 @@ x_window (struct frame *f, long window_prompting, int minibuffer_only)
   {
     int len;
     char *tem, shell_position[32];
-    Arg al[10];
-    int ac = 0;
+    Arg gal[10];
+    int gac = 0;
     int extra_borders = 0;
     int menubar_size
       = (f->output_data.x->menubar_widget
@@ -2489,8 +2489,8 @@ x_window (struct frame *f, long window_prompting, int minibuffer_only)
              If Emacs had just one program position, we could set it in
              fallback resources, but since each make-frame call can specify
              different program positions, this is easier.  */
-          XtSetArg (al[ac], XtNx, left); ac++;
-          XtSetArg (al[ac], XtNy, top); ac++;
+          XtSetArg (gal[gac], XtNx, left); gac++;
+          XtSetArg (gal[gac], XtNy, top); gac++;
         }
     }
 
@@ -2501,8 +2501,8 @@ x_window (struct frame *f, long window_prompting, int minibuffer_only)
        when the frame is deleted.  */
     tem = (char *) xmalloc (len);
     strncpy (tem, shell_position, len);
-    XtSetArg (al[ac], XtNgeometry, tem); ac++;
-    XtSetValues (shell_widget, al, ac);
+    XtSetArg (gal[gac], XtNgeometry, tem); gac++;
+    XtSetValues (shell_widget, gal, gac);
   }
 
   XtManageChild (pane_widget);