* window.c (Fwindow_combination_limit): Make first arg non-optional

since it is meaningless for live windows like the selected window.

diff --git a/src/ChangeLog b/src/ChangeLog
index 1bb4a6a59935a33e20271525e87618010e611225..1fff4517c0b9e4dd5e7bc0ab5a7c01fd31762cb1 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2011-11-18  Chong Yidong  <cyd@gnu.org>
+
+       * window.c (Fwindow_combination_limit): Make first argument
+       non-optional, since it is meaningless for live windows like the
+       selected window.
+
 2011-11-18  Dmitry Antipov  <dmantipov@yandex.ru>
 
        * keymap.c (Fwhere_is_internal): Add missing RETURN_UNGCPROs.

diff --git a/src/window.c b/src/window.c
index 641f7a397a4572e93c975963088b16ce70d47b43..ae0c7431f748473f1b824a51bad854116d07583f 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -465,10 +465,8 @@ Return nil if WINDOW has no previous sibling.  */)
   return decode_any_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.
-If WINDOW is omitted or nil, it defaults to the selected window.
-
 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.  */)
@@ -479,8 +477,6 @@ WINDOW are never \(re-)combined with WINDOW's siblings.  */)
 
 DEFUN ("set-window-combination-limit", Fset_window_combination_limit, Sset_window_combination_limit, 2, 2, 0,
        doc: /* Set combination limit of window WINDOW to STATUS; return STATUS.
-If WINDOW is omitted or nil, it defaults to the selected window.
-
 If STATUS is nil, child windows of WINDOW can be recombined with
 WINDOW's siblings.  STATUS t means that child windows of WINDOW are
 never \(re-)combined with WINDOW's siblings.  Other values are reserved