mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-07 04:10:27 -08:00
Code Issues Projects Releases Wiki Activity

(Fdelete_window): Handle deleting a parent of the selected window.

Browse source 
(Fdelete_window): Mostly undo last change which made `frame' a FRAME_PTR.
Don't initialize `frame' in the declaration.
This commit is contained in:
Richard M. Stallman 1993-06-14 07:07:05 +00:00
parent 087f61c885
commit 0def0403ca
1 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/window.c
View file

@ -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;
}
}