(window_loop, case UNSHOW_BUFFER):

When we delete a frame, skip all the windows on that frame.

diff --git a/src/window.c b/src/window.c
index 22db914d7f6f1d259af71c48c39e9e25903d330e..cf5aa8db7cde1571e1e417e53555cf4b9bdfe002 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -1337,7 +1337,26 @@ window_loop (type, obj, mini, frames)
                if (EQ (w, FRAME_ROOT_WINDOW (f))
                    && !NILP (XWINDOW (w)->dedicated)
                    && other_visible_frames (f))
-                 Fdelete_frame (WINDOW_FRAME (XWINDOW (w)), Qnil);
+                 {
+                   /* Skip the other windows on this frame.
+                      There might be one, the minibuffer!  */
+                   if (! EQ (w, last_window))
+                     while (f == XFRAME (WINDOW_FRAME (XWINDOW (next_window))))
+                       {
+                         /* As we go, check for the end of the loop.
+                            We mustn't start going around a second time.  */
+                         if (EQ (next_window, last_window))
+                           {
+                             last_window = w;
+                             break;
+                           }
+                         next_window = Fnext_window (next_window,
+                                                     mini ? Qt : Qnil,
+                                                     frame_arg);
+                       }
+                   /* Now we can safely delete the frame.  */
+                   Fdelete_frame (WINDOW_FRAME (XWINDOW (w)), Qnil);
+                 }
                else
 #endif
                  {