diff options
| author | Chong Yidong <cyd@gnu.org> | 2011-11-19 19:09:10 +0800 |
|---|---|---|
| committer | Chong Yidong <cyd@gnu.org> | 2011-11-19 19:09:10 +0800 |
| commit | df05a53c61885a7d11265e36723742c12ab1a061 (patch) | |
| tree | ffc919df5965cdb6bbe9348964db718458f8bb46 | |
| parent | c56cad4ac04ca0da464926f826e7d2fa246fa3eb (diff) | |
| download | emacs-df05a53c61885a7d11265e36723742c12ab1a061.tar.gz | |
* window.c (Fwindow_combination_limit): Make first arg non-optional
since it is meaningless for live windows like the selected window.
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/window.c | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 1bb4a6a5993..1fff4517c0b 100644 --- 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 641f7a397a4..ae0c7431f74 100644 --- 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 |