Revert "Cleanup tooltips"

This reverts commit 20038f8ab75dd1551412a43cd58520c483c22921.

I am reverting this change because it was applied without prior discussion
on emacs-devel, and has been found to break the NS port.  It needs more
testing and review before it should be applied here.

1 files changed, 1 insertions, 6 deletions

diff --git a/src/menu.c b/src/menu.c
index 675caff6b88..90bb19a2e94 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -1400,12 +1400,7 @@ no quit occurs and `x-popup-menu' returns nil.  */)
 #ifdef HAVE_WINDOW_SYSTEM
   /* Hide a previous tip, if any.  */
   if (!FRAME_TERMCAP_P (f))
-    {
-      Lisp_Object frame;
-
-      XSETFRAME (frame, f);
-      Fx_hide_tip (frame);
-    }
+    Fx_hide_tip ();
 #endif
 
 #ifdef HAVE_NTGUI     /* FIXME: Is it really w32-specific?  --Stef  */