From: Eli Zaretskii <eliz@gnu.org>
Date: Tue, 9 Oct 2012 17:58:18 +0000 (+0200)
Subject: Avoid shadowing a global variable by a local one in frame.c.
X-Git-Tag: emacs-24.2.90~237^2~15
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cf5fc6dbeac10220394ab201ba3f4402e1e91faf;p=emacs.git

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

 src/frame.c (delete_frame): Rename local variable 'tooltip_frame' to
 'is_tooltip_frame', to avoid confusion with its global namesake.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 1acf2e0b5f9..ee1057bc64d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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
diff --git a/src/frame.c b/src/frame.c
index 599d8879169..017d051fc1d 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -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;