2 files changed, 9 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 0f907bff031..e573b9d2f2e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2001-03-25  Gerd Moellmann  <gerd@gnu.org>
+
+        * frame.c (Fframe_list): Don't return a tooltip frame.
+
 2001-03-23  Gerd Moellmann  <gerd@gnu.org>
 
         * xdisp.c (mark_window_display_accurate_1): New function, 
diff --git a/src/frame.c b/src/frame.c
index 08aa8e4494c..7c6cd89a196 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -807,7 +807,11 @@ DEFUN ("frame-list", Fframe_list, Sframe_list,
        "Return a list of all frames.")
   ()
 {
-  return Fcopy_sequence (Vframe_list);
+  Lisp_Object frames;
+  frames = Fcopy_sequence (Vframe_list);
+  if (FRAMEP (tip_frame))
+    frames = Fdelq (tip_frame, frames);
+  return frames;
 }
 
 /* Return the next frame in the frame list after FRAME.