2 files changed, 14 insertions, 4 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 0a277a0d67b..10c48b80f76 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,12 @@
 2012-11-06  Dmitry Antipov  <dmantipov@yandex.ru>
 
+        * window.c (Fwindow_combination_limit): Revert to the only
+        required argument and adjust docstring as suggested in
+        http://lists.gnu.org/archive/html/emacs-diffs/2012-11/msg01082.html
+        by Martin Rudalics <rudalics@gmx.at>.
+
+2012-11-06  Dmitry Antipov  <dmantipov@yandex.ru>
+
         Widely used frame validity and checking functions.
         * frame.h (decode_live_frame, decode_any_frame): Add prototypes.
         * frame.c (decode_live_frame, decode_any_frame): New functions.
diff --git a/src/window.c b/src/window.c
index c32234b5fcd..f1177be3d99 100644
--- a/src/window.c
+++ b/src/window.c
@@ -602,15 +602,18 @@ Return nil if WINDOW has no previous sibling.  */)
   return decode_valid_window (window)->prev;
 }
 
-DEFUN ("window-combination-limit", Fwindow_combination_limit, Swindow_combination_limit, 0, 1, 0,
+DEFUN ("window-combination-limit", Fwindow_combination_limit, Swindow_combination_limit, 1, 1, 0,
        doc: /* Return combination limit of window WINDOW.
-WINDOW must be a valid window and defaults to the selected one.
 If the return value is nil, child windows of WINDOW can be recombined with
 WINDOW's siblings.  A return value of t means that child windows of
-WINDOW are never \(re-)combined with WINDOW's siblings.  */)
+WINDOW are never \(re-)combined with WINDOW's siblings.
+
+WINDOW must be a valid window.  The return value is meaningful for
+internal windows only.  */)
   (Lisp_Object window)
 {
-  return decode_valid_window (window)->combination_limit;
+  CHECK_VALID_WINDOW (window);
+  return XWINDOW (window)->combination_limit;
 }
 
 DEFUN ("set-window-combination-limit", Fset_window_combination_limit, Sset_window_combination_limit, 2, 2, 0,