procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid shadowing a global variable by a local one in frame.c.

Browse source 
src/frame.c (delete_frame): Rename local variable 'tooltip_frame' to
 'is_tooltip_frame', to avoid confusion with its global namesake.
This commit is contained in:
Eli Zaretskii 2012-10-09 19:58:18 +02:00
parent 238f3a587a
commit cf5fc6dbea
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2012-10-09 Eli Zaretskii <eliz@gnu.org>
* frame.c (delete_frame): Rename local variable 'tooltip_frame' to
'is_tooltip_frame', to avoid confusion with its global namesake.
2012-10-08 Daniel Colascione <dancol@dancol.org>
* xdisp.c (start_hourglass): Call w32_note_current_window when

8
src/frame.c
View file

@ -1124,7 +1124,7 @@ delete_frame (Lisp_Object frame, Lisp_Object force)
struct frame *sf = SELECTED_FRAME ();
struct kboard *kb;
int minibuffer_selected, tooltip_frame;
int minibuffer_selected, is_tooltip_frame;
if (EQ (frame, Qnil))
{
@ -1176,13 +1176,13 @@ delete_frame (Lisp_Object frame, Lisp_Object force)
}
}
tooltip_frame = !NILP (Fframe_parameter (frame, intern ("tooltip")));
is_tooltip_frame = !NILP (Fframe_parameter (frame, intern ("tooltip")));
/* Run `delete-frame-functions' unless FORCE is `noelisp' or
frame is a tooltip. FORCE is set to `noelisp' when handling
a disconnect from the terminal, so we don't dare call Lisp
code. */
if (NILP (Vrun_hooks) || tooltip_frame)
if (NILP (Vrun_hooks) || is_tooltip_frame)
;
else if (EQ (force, Qnoelisp))
pending_funcalls
@ -1461,7 +1461,7 @@ delete_frame (Lisp_Object frame, Lisp_Object force)
}
/* Cause frame titles to update--necessary if we now have just one frame. */
if (!tooltip_frame)
if (!is_tooltip_frame)
update_mode_lines = 1;
return Qnil;