From 0def0403ca727619f461d20d9cb78becab70c8ac Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Mon, 14 Jun 1993 07:07:05 +0000 Subject: [PATCH] (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. --- src/window.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/src/window.c b/src/window.c index e50a9bc7be..d3baca1d8a 100644 --- a/src/window.c +++ b/src/window.c @@ -700,9 +700,22 @@ DEFUN ("delete-window", Fdelete_window, Sdelete_window, 0, 1, "", /* Are we trying to delete any frame's selected window? */ { - FRAME_PTR frame = WINDOW_FRAME (XWINDOW (window)); + Lisp_Object frame, pwindow; - if (EQ (window, FRAME_SELECTED_WINDOW (frame))) + /* 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 @@ DEFUN ("delete-window", Fdelete_window, Sdelete_window, 0, 1, "", if (EQ (window, selected_window)) Fselect_window (alternative); else - FRAME_SELECTED_WINDOW (frame) = alternative; + FRAME_SELECTED_WINDOW (XFRAME (frame)) = alternative; } } -- 2.20.1