(x_consider_frame_title): Don't count the tooltip frame

when checking for multiple frames.

diff --git a/src/ChangeLog b/src/ChangeLog
index bd5fbc5957d0e3a98891ea23222a46858f293cb3..13536e505e192b3e37bb16e3af93d9487c021eae 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-09  Jason Rumney  <jasonr@gnu.org>
+
+       * xdisp.c (x_consider_frame_title): Don't count the tooltip frame
+       when checking for multiple frames.
+
 2002-01-08  Richard M. Stallman  <rms@gnu.org>
 
        * window.c (delete_window): Rewrite the code for changing the

diff --git a/src/xdisp.c b/src/xdisp.c
index 0d25501e1a1a88b762970cec2dbcc959daf99c55..d7491121ee0b7e3a4a0a1e4b9389edffb319ddaa 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -7224,11 +7224,13 @@ x_consider_frame_title (frame)
 
       for (tail = Vframe_list; CONSP (tail); tail = XCDR (tail))
        {
-         struct frame *tf = XFRAME (XCAR (tail));
+         Lisp_Object other_frame = XCAR (tail);
+         struct frame *tf = XFRAME (other_frame);
 
          if (tf != f 
              && FRAME_KBOARD (tf) == FRAME_KBOARD (f)
              && !FRAME_MINIBUF_ONLY_P (tf)
+             && !EQ (other_frame, tip_frame)
              && (FRAME_VISIBLE_P (tf) || FRAME_ICONIFIED_P (tf)))
            break;
        }