# HG changeset patch
# User james
# Date 1058452884 0
# Node ID bd921b813d336b8cbdb4f5c0cd8114296f6bbd58
# Parent  e0ca0b9b1a352e53c87eefda23759b3aa8ea0c98
[xemacs-hg @ 2003-07-17 14:41:23 by james]
Follow first-hchild and first-vchild links even when next-child is nil.

diff -r e0ca0b9b1a35 -r bd921b813d33 lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Jul 17 13:10:49 2003 +0000
+++ b/lisp/ChangeLog	Thu Jul 17 14:41:24 2003 +0000
@@ -1,3 +1,8 @@
+2003-07-16  Jerry James  <james@xemacs.org>
+
+	* window-xemacs.el (restore-saved-window): Follow first-hchild and
+	first-vchild links even when next-child is nil.
+
 2003-07-06  Adrian Aichner  <adrian@xemacs.org>
 
 	* package-get.el (package-get-package-index-file-location): Handle
diff -r e0ca0b9b1a35 -r bd921b813d33 lisp/window-xemacs.el
--- a/lisp/window-xemacs.el	Thu Jul 17 13:10:49 2003 +0000
+++ b/lisp/window-xemacs.el	Thu Jul 17 14:41:24 2003 +0000
@@ -345,29 +345,28 @@
 
 (defun restore-saved-window (configuration window saved-window direction)
   "Within CONFIGURATION, restore WINDOW to the state of SAVED-WINDOW."
-  (if (saved-window-next-child saved-window)
-      (progn
-	(if (not (saved-window-minibufferp (saved-window-next-child saved-window)))
-	    (progn
-	      (cond ((eq direction 'vertical)
-		     (split-window window nil nil))
-		    ((eq direction 'horizontal)
-		     (split-window window nil t)))
-	      (restore-saved-window configuration
-				    (window-next-child window)
-				    (saved-window-next-child saved-window)
-				    direction)))
+  (and (saved-window-next-child saved-window)
+       (not (saved-window-minibufferp (saved-window-next-child saved-window)))
+       (progn
+	 (cond ((eq direction 'vertical)
+		(split-window window nil nil))
+	       ((eq direction 'horizontal)
+		(split-window window nil t)))
+	 (restore-saved-window configuration
+			       (window-next-child window)
+			       (saved-window-next-child saved-window)
+			       direction)))
 
-	(if (saved-window-first-hchild saved-window)
-	    (restore-saved-window configuration
-				  window
-				  (saved-window-first-hchild saved-window)
-				  'horizontal))
-	(if (saved-window-first-vchild saved-window)
-	    (restore-saved-window configuration
-				  window
-				  (saved-window-first-vchild saved-window)
-				  'vertical))))
+  (if (saved-window-first-hchild saved-window)
+      (restore-saved-window configuration
+			    window
+			    (saved-window-first-hchild saved-window)
+			    'horizontal))
+  (if (saved-window-first-vchild saved-window)
+      (restore-saved-window configuration
+			    window
+			    (saved-window-first-vchild saved-window)
+			    'vertical))
 
   (if (not (saved-window-minibufferp saved-window))
       (restore-saved-window-parameters configuration window saved-window)))