From 5494d7bcdba82b2c33278b8d37fee6b0c9bd14e5 Mon Sep 17 00:00:00 2001
From: Jan Djärv
Date: Mon, 6 Jun 2005 10:38:40 +0000
Subject: * window.c (delete_window): Handle the case where a h/vchild has a
 h/vchild.

---
 src/window.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 48 insertions(+), 1 deletion(-)

(limited to 'src/window.c')

diff --git a/src/window.c b/src/window.c
index faf88c91ffc..4839830b177 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1452,8 +1452,10 @@ delete_window (window)
   tem = par->hchild;
   if (NILP (tem))
     tem = par->vchild;
-  if (NILP (XWINDOW (tem)->next))
+  if (NILP (XWINDOW (tem)->next)) {
     replace_window (parent, tem);
+    par = XWINDOW (tem);
+  }
 
   /* Since we may be deleting combination windows, we must make sure that
      not only p but all its children have been marked as deleted.  */
@@ -1465,6 +1467,51 @@ delete_window (window)
   /* Mark this window as deleted.  */
   p->buffer = p->hchild = p->vchild = Qnil;
 
+  if (! NILP (par->parent))
+    par = XWINDOW (par->parent);
+
+  /* Check if we have a v/hchild with a v/hchild.  In that case remove
+     one of them.  */
+  
+  if (! NILP (par->vchild) && ! NILP (XWINDOW (par->vchild)->vchild))
+    {
+      p = XWINDOW (par->vchild);
+      par->vchild = p->vchild;
+      tem = p->vchild;
+    }
+  else if (! NILP (par->hchild) && ! NILP (XWINDOW (par->hchild)->hchild))
+    {
+      p = XWINDOW (par->hchild);
+      par->hchild = p->hchild;
+      tem = p->hchild;
+    }
+  else
+    p = 0;
+
+  if (p)
+    {
+      while (! NILP (tem)) {
+        XWINDOW (tem)->parent = p->parent;
+        if (NILP (XWINDOW (tem)->next))
+          break;
+        tem = XWINDOW (tem)->next;
+      }
+      if (! NILP (tem)) {
+        /* The next of the v/hchild we are removing is now the next of the
+           last child for the v/hchild:
+           Before v/hchild -> v/hchild -> next1 -> next2
+                    |
+                     -> next3
+           After:  v/hchild -> next1 -> next2 -> next3
+        */
+        XWINDOW (tem)->next = p->next;
+        if (! NILP (p->next))
+          XWINDOW (p->next)->prev = tem;
+      }
+      p->next = p->prev = p->vchild = p->hchild = p->buffer = Qnil;
+    }
+
+
   /* Adjust glyph matrices. */
   adjust_glyphs (f);
   UNBLOCK_INPUT;
-- 
cgit v1.2.1


From c869384d74ca1fc2c33b25eb28316b3a6415dcf8 Mon Sep 17 00:00:00 2001
From: Luc Teirlinck
Date: Fri, 10 Jun 2005 02:36:07 +0000
Subject: (Fselect_window): Adapt call to Fselect_frame.

---
 src/window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/window.c')

diff --git a/src/window.c b/src/window.c
index 4839830b177..1f2af647677 100644
--- a/src/window.c
+++ b/src/window.c
@@ -3234,7 +3234,7 @@ selects the buffer of the selected window before each command.  */)
 	 so that FRAME_FOCUS_FRAME is moved appropriately as we
 	 move around in the state where a minibuffer in a separate
 	 frame is active.  */
-      Fselect_frame (WINDOW_FRAME (w), Qnil);
+      Fselect_frame (WINDOW_FRAME (w));
     }
   else
     sf->selected_window = window;
-- 
cgit v1.2.1