* frame.c (Fdelete_frame): Delete all the windows in the frame's

	window tree, using delete_all_subwindows.
	* window.c (delete_all_subwindows): Don't make this static
	anymore.

1 files changed, 5 insertions, 0 deletions

diff --git a/src/frame.c b/src/frame.c
index 5ffb04c843a..ddf98ab32ae 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -616,6 +616,11 @@ A frame may not be deleted if its minibuffer is used by other frames.")
       minibuf_window = selected_frame->minibuffer_window;
     }
 
+  /* Mark all the windows that used to be on FRAME as deleted, and then
+     remove the reference to them.  */
+  delete_all_subwindows (XWINDOW (f->root_window));
+  f->root_window = Qnil;
+
   Vframe_list = Fdelq (frame, Vframe_list);
   f->visible = 0;
   displ = f->display;