(Fdelete_frame): Don't let echo_area_window to remain on a deleted frame.

2 files changed, 9 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index c3049efe987..1976bbdca94 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2000-02-22  Eli Zaretskii  <eliz@is.elta.co.il>
+
+        * frame.c (Fdelete_frame): Don't let echo_area_window to remain on
+        a deleted frame.
+
 2000-02-21  Gerd Moellmann  <gerd@gnu.org>
 
         * frame.c (Fmouse_position): GCPRO retval instead of x and y.
diff --git a/src/frame.c b/src/frame.c
index 441449f5705..eb0f752fc06 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -1222,6 +1222,10 @@ but if the second optional argument FORCE is non-nil, you may do so.")
         Fselect_window (minibuf_window);
     }
 
+  /* Don't let echo_area_window to remain on a deleted frame.  */
+  if (EQ (f->minibuffer_window, echo_area_window))
+    echo_area_window = sf->minibuffer_window;
+
   /* Clear any X selections for this frame.  */
 #ifdef HAVE_X_WINDOWS
   if (FRAME_X_P (f))