From: Dmitry Antipov Date: Tue, 6 Nov 2012 15:57:14 +0000 (+0400) Subject: * window.c (Fwindow_combination_limit): Revert to the only X-Git-Url: http://git.hcoop.net/bpt/emacs.git/commitdiff_plain/72f94d4be8224bb7f51bef559c7565fa80724ca6 * 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 . --- diff --git a/src/ChangeLog b/src/ChangeLog index 0a277a0d67..10c48b80f7 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2012-11-06 Dmitry Antipov + + * 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 . + 2012-11-06 Dmitry Antipov Widely used frame validity and checking functions. diff --git a/src/window.c b/src/window.c index c32234b5fc..f1177be3d9 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,