[Emacs-diffs] /srv/bzr/emacs/trunk r106424: * window.c (Fwindow_combination_limit): Make first arg non-optional

[Chong Yidong]

------------------------------------------------------------
revno: 106424
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sat 2011-11-19 19:09:10 +0800
message:
  * window.c (Fwindow_combination_limit): Make first arg non-optional
  since it is meaningless for live windows like the selected window.
modified:
  src/ChangeLog
  src/window.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-11-19 08:39:42 +0000
+++ b/src/ChangeLog     2011-11-19 11:09:10 +0000
@@ -1,3 +1,9 @@
+2011-11-18  Chong Yidong  <address@hidden>
+
+       * 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  <address@hidden>
 
        * keymap.c (Fwhere_is_internal): Add missing RETURN_UNGCPROs.

=== modified file 'src/window.c'
--- a/src/window.c      2011-11-17 12:16:44 +0000
+++ b/src/window.c      2011-11-19 11:09:10 +0000
@@ -465,10 +465,8 @@
   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 @@
 
 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