(prepare_menu_bars): Changes for tip_frame being a

Lisp_Object.

diff --git a/src/xdisp.c b/src/xdisp.c
index 6e0b565b2649e8f55a2fce72945cfb5759a83983..13a9fa85b0f7879201869b9b0c73212d15b2ec8a 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -6862,12 +6862,12 @@ prepare_menu_bars ()
   int all_windows;
   struct gcpro gcpro1, gcpro2;
   struct frame *f;
-  struct frame *tooltip_frame;
+  Lisp_Object tooltip_frame;
 
 #ifdef HAVE_X_WINDOWS
   tooltip_frame = tip_frame;
 #else
-  tooltip_frame = NULL;
+  tooltip_frame = Qnil;
 #endif
 
   /* Update all frame titles based on their buffer names, etc.  We do
@@ -6881,7 +6881,7 @@ prepare_menu_bars ()
       FOR_EACH_FRAME (tail, frame)
        {
          f = XFRAME (frame);
-         if (f != tooltip_frame
+         if (!EQ (frame, tooltip_frame)
              && (FRAME_VISIBLE_P (f) || FRAME_ICONIFIED_P (f)))
            x_consider_frame_title (frame);
        }
@@ -6905,7 +6905,7 @@ prepare_menu_bars ()
          f = XFRAME (frame);
 
          /* Ignore tooltip frame.  */
-         if (f == tooltip_frame)
+         if (EQ (frame, tooltip_frame))
            continue;
          
          /* If a window on this frame changed size, report that to