2 files changed, 8 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index bd5fbc5957d..13536e505e1 100644
--- 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 0d25501e1a1..d7491121ee0 100644
--- 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;
         }