mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-20 19:42:53 -08:00
Code Issues Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Paul Eggert 2011-04-15 19:57:41 -07:00
parent 436c16df9a
commit 8a94ea3340
2 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/ChangeLog
View file

@ -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.

12
src/xfns.c
View file

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