Delete window-combination-p; tweaks to window-top-child and window-left-child.

* lisp/window.el (window-combination-p): Function deleted; its
side-effect is not used in any existing code.
(window-combinations, window-combined-p): Call window-*-child
directly.

* window.c (Fwindow_live_p, Fwindow_frame, Fframe_root_window)
(Fminibuffer_window, Fwindow_buffer, Fwindow_splits)
(Fset_window_splits, Fwindow_nest, Fset_window_nest)
(Fwindow_use_time, Fwindow_total_size, Fwindow_normal_size)
(Fwindow_new_normal, Fwindow_left_column, Fwindow_top_line)
(Fwindow_margins, Fwindow_fringes, Fwindow_scroll_bars)
(Fwindow_vscroll): Doc fix.
(Fwindow_top_child, Fwindow_left_child): Eliminate a nil default
argument, since it makes no sense to pass a live window and for
consistency with window-child.

2 files changed, 25 insertions, 19 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9d0ecd46663..6cc9cc86515 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2011-11-06  Chong Yidong  <cyd@gnu.org>
+
+        * window.el (window-combination-p): Function deleted; its
+        side-effect is not used in any existing code.
+        (window-combinations, window-combined-p): Call window-*-child
+        directly.
+
 2011-11-05  Chong Yidong  <cyd@gnu.org>
 
         * window.el (window-valid-p): Rename from window-any-p.
diff --git a/lisp/window.el b/lisp/window.el
index 618cd6487fb..1b51bde36bd 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -195,36 +195,35 @@ narrower, explictly specify the SIZE argument of that function."
   :version "24.1"
   :group 'windows)
 
-(defun window-combination-p (&optional window horizontal)
-  "If WINDOW is a vertical combination return WINDOW's first child.
-WINDOW can be any window and defaults to the selected one.
-Optional argument HORIZONTAL non-nil means return WINDOW's first
-child if WINDOW is a horizontal combination."
-  (setq window (window-normalize-window window))
-  (if horizontal
-      (window-left-child window)
-    (window-top-child window)))
-
 (defsubst window-combined-p (&optional window horizontal)
-  "Return non-nil if and only if WINDOW is vertically combined.
-WINDOW can be any window and defaults to the selected one.
-Optional argument HORIZONTAL non-nil means return non-nil if and
-only if WINDOW is horizontally combined."
+  "Return non-nil if WINDOW has siblings in a given direction.
+If WINDOW is omitted or nil, it defaults to the selected window.
+
+HORIZONTAL determines a direction for the window combination.
+If HORIZONTAL is omitted or nil, return non-nil if WINDOW is part
+of a vertical window combination.
+If HORIZONTAL is non-nil, return non-nil if WINDOW is part of a
+horizontal window combination."
   (setq window (window-normalize-window window))
   (let ((parent (window-parent window)))
-    (and parent (window-combination-p parent horizontal))))
+    (and parent
+         (if horizontal
+             (window-left-child parent)
+           (window-top-child parent)))))
 
 (defun window-combinations (&optional window horizontal)
   "Return largest number of vertically arranged subwindows of WINDOW.
-WINDOW can be any window and defaults to the selected one.
-Optional argument HORIZONTAL non-nil means to return the largest
-number of horizontally arranged subwindows of WINDOW."
+If WINDOW is omitted or nil, it defaults to the selected window.
+If HORIZONTAL is non-nil, return the largest number of
+horizontally arranged subwindows of WINDOW."
   (setq window (window-normalize-window window))
   (cond
    ((window-live-p window)
     ;; If WINDOW is live, return 1.
     1)
-   ((window-combination-p window horizontal)
+   ((if horizontal
+        (window-left-child window)
+      (window-top-child window))
     ;; If WINDOW is iso-combined, return the sum of the values for all
     ;; subwindows of WINDOW.
     (let ((child (window-child window))