From 8a94ea3340922bea3934b2cec512918c4b4b13ef Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Fri, 15 Apr 2011 19:57:41 -0700 Subject: [PATCH] * xfns.c (x_window): Rename locals to avoid shadowing. --- src/ChangeLog | 1 + src/xfns.c | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 5bf84ff11d..fe12999e45 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,6 +1,7 @@ 2011-04-16 Paul Eggert * 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 f473541f05..3d17f22be6 100644 --- 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); -- 2.20.1