From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 16 Apr 2011 15:12:29 +0000 (-0700)
Subject: * xfns.c (Fx_hide_tip): Move locals to avoid shadowing.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~268^2~32
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1fe72bf8610f908150f44357a86076bfddc7c26f;p=emacs.git

* xfns.c (Fx_hide_tip): Move locals to avoid shadowing.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 350e522f6b1..6afd3836568 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2011-04-16  Paul Eggert  <eggert@cs.ucla.edu>
 
+	* xfns.c (Fx_hide_tip): Move locals to avoid shadowing.
+
 	* menu.c (push_submenu_start, push_submenu_end): Do not define unless
 	USE_X_TOOLKIT || USE_GTK || HAVE_NS || defined HAVE_NTGUI.
 	(single_menu_item): Rename local to avoid shadowing.
diff --git a/src/xfns.c b/src/xfns.c
index 1489cbf043e..aa373f3a82f 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -5205,7 +5205,6 @@ Value is t if tooltip was open, nil otherwise.  */)
   int count;
   Lisp_Object deleted, frame, timer;
   struct gcpro gcpro1, gcpro2;
-  struct frame *f;
 
   /* Return quickly if nothing to do.  */
   if (NILP (tip_timer) && NILP (tip_frame))
@@ -5224,11 +5223,13 @@ Value is t if tooltip was open, nil otherwise.  */)
     call1 (Qcancel_timer, timer);
 
 #ifdef USE_GTK
-  /* When using system tooltip, tip_frame is the Emacs frame on which
-     the tip is shown.  */
-  f = XFRAME (frame);
-  if (FRAME_LIVE_P (f) && xg_hide_tooltip (f))
-    frame = Qnil;
+  {
+    /* When using system tooltip, tip_frame is the Emacs frame on which
+       the tip is shown.  */
+    struct frame *f = XFRAME (frame);
+    if (FRAME_LIVE_P (f) && xg_hide_tooltip (f))
+      frame = Qnil;
+  }
 #endif
 
   if (FRAMEP (frame))
@@ -5242,7 +5243,7 @@ Value is t if tooltip was open, nil otherwise.  */)
 	 items is unmapped.  Redisplay the menu manually...  */
       {
         Widget w;
-	f = SELECTED_FRAME ();
+	struct frame *f = SELECTED_FRAME ();
 	w = f->output_data.x->menubar_widget;
 
 	if (!DoesSaveUnders (FRAME_X_DISPLAY_INFO (f)->screen)