[Emacs-diffs] /srv/bzr/emacs/trunk r110490: Avoid shadowing a global variable by a local one in frame.c.

[Eli Zaretskii]

------------------------------------------------------------
revno: 110490
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Tue 2012-10-09 19:58:18 +0200
message:
  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.
modified:
  src/ChangeLog
  src/frame.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-10-09 06:33:51 +0000
+++ b/src/ChangeLog     2012-10-09 17:58:18 +0000
@@ -1,3 +1,8 @@
+2012-10-09  Eli Zaretskii  <address@hidden>
+
+       * 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  <address@hidden>
 
        * xdisp.c (start_hourglass): Call w32_note_current_window when

=== modified file 'src/frame.c'
--- a/src/frame.c       2012-10-07 22:31:58 +0000
+++ b/src/frame.c       2012-10-09 17:58:18 +0000
@@ -1124,7 +1124,7 @@
   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 @@
        }
     }
 
-  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 @@
     }
 
   /* 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;