aboutsummaryrefslogtreecommitdiffstats
path: root/src/window.c
diff options
context:
space:
mode:
authorChong Yidong2011-11-19 19:09:10 +0800
committerChong Yidong2011-11-19 19:09:10 +0800
commitdf05a53c61885a7d11265e36723742c12ab1a061 (patch)
treeffc919df5965cdb6bbe9348964db718458f8bb46 /src/window.c
parentc56cad4ac04ca0da464926f826e7d2fa246fa3eb (diff)
downloademacs-df05a53c61885a7d11265e36723742c12ab1a061.tar.gz
emacs-df05a53c61885a7d11265e36723742c12ab1a061.zip
* window.c (Fwindow_combination_limit): Make first arg non-optional
since it is meaningless for live windows like the selected window.
Diffstat (limited to 'src/window.c')
-rw-r--r--src/window.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/window.c b/src/window.c
index 641f7a397a4..ae0c7431f74 100644
--- a/src/window.c
+++ b/src/window.c
@@ -465,10 +465,8 @@ Return nil if WINDOW has no previous sibling. */)
465 return decode_any_window (window)->prev; 465 return decode_any_window (window)->prev;
466} 466}
467 467
468DEFUN ("window-combination-limit", Fwindow_combination_limit, Swindow_combination_limit, 0, 1, 0, 468DEFUN ("window-combination-limit", Fwindow_combination_limit, Swindow_combination_limit, 1, 1, 0,
469 doc: /* Return combination limit of window WINDOW. 469 doc: /* Return combination limit of window WINDOW.
470If WINDOW is omitted or nil, it defaults to the selected window.
471
472If the return value is nil, child windows of WINDOW can be recombined with 470If the return value is nil, child windows of WINDOW can be recombined with
473WINDOW's siblings. A return value of t means that child windows of 471WINDOW's siblings. A return value of t means that child windows of
474WINDOW are never \(re-)combined with WINDOW's siblings. */) 472WINDOW are never \(re-)combined with WINDOW's siblings. */)
@@ -479,8 +477,6 @@ WINDOW are never \(re-)combined with WINDOW's siblings. */)
479 477
480DEFUN ("set-window-combination-limit", Fset_window_combination_limit, Sset_window_combination_limit, 2, 2, 0, 478DEFUN ("set-window-combination-limit", Fset_window_combination_limit, Sset_window_combination_limit, 2, 2, 0,
481 doc: /* Set combination limit of window WINDOW to STATUS; return STATUS. 479 doc: /* Set combination limit of window WINDOW to STATUS; return STATUS.
482If WINDOW is omitted or nil, it defaults to the selected window.
483
484If STATUS is nil, child windows of WINDOW can be recombined with 480If STATUS is nil, child windows of WINDOW can be recombined with
485WINDOW's siblings. STATUS t means that child windows of WINDOW are 481WINDOW's siblings. STATUS t means that child windows of WINDOW are
486never \(re-)combined with WINDOW's siblings. Other values are reserved 482never \(re-)combined with WINDOW's siblings. Other values are reserved