# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 740041625 0
# Node ID ccb9c93aac80db9074ab16232bd51eaf506f7267
# Parent  c9938769a6b707befe67bc9ca699478e93ef6962
(Fdelete_window): Handle deleting a parent of the selected window.

(Fdelete_window): Mostly undo last change which made `frame' a FRAME_PTR.
Don't initialize `frame' in the declaration.

diff -r c9938769a6b7 -r ccb9c93aac80 src/window.c
--- a/src/window.c	Mon Jun 14 03:51:20 1993 +0000
+++ b/src/window.c	Mon Jun 14 07:07:05 1993 +0000
@@ -700,9 +700,22 @@
 
   /* Are we trying to delete any frame's selected window?  */
   {
-    FRAME_PTR frame = WINDOW_FRAME (XWINDOW (window));
-
-    if (EQ (window, FRAME_SELECTED_WINDOW (frame)))
+    Lisp_Object frame, pwindow;
+
+    /* See if the frame's selected window is either WINDOW
+       or any subwindow of it, by finding all that window's parents
+       and comparing each one with WINDOW.  */
+    frame = WINDOW_FRAME (XWINDOW (window));
+    pwindow = FRAME_SELECTED_WINDOW (XFRAME (frame));
+
+    while (!NILP (pwindow))
+      {
+	if (EQ (window, pwindow))
+	  break;
+	pwindow = XWINDOW (pwindow)->parent;
+      }
+
+    if (EQ (window, pwindow))
       {
 	Lisp_Object alternative = Fnext_window (window, Qlambda, Qnil);
 
@@ -714,7 +727,7 @@
 	if (EQ (window, selected_window))
 	  Fselect_window (alternative);
 	else
-	  FRAME_SELECTED_WINDOW (frame) = alternative;
+	  FRAME_SELECTED_WINDOW (XFRAME (frame)) = alternative;
       }
   }