[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r110814: * window.c (Fwindow_combinat
From: |
Dmitry Antipov |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r110814: * window.c (Fwindow_combination_limit): Revert to the only |
Date: |
Tue, 06 Nov 2012 19:57:14 +0400 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 110814
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Tue 2012-11-06 19:57:14 +0400
message:
* 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 <address@hidden>.
modified:
src/ChangeLog
src/window.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2012-11-06 13:26:20 +0000
+++ b/src/ChangeLog 2012-11-06 15:57:14 +0000
@@ -1,5 +1,12 @@
2012-11-06 Dmitry Antipov <address@hidden>
+ * 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 <address@hidden>.
+
+2012-11-06 Dmitry Antipov <address@hidden>
+
Widely used frame validity and checking functions.
* frame.h (decode_live_frame, decode_any_frame): Add prototypes.
* frame.c (decode_live_frame, decode_any_frame): New functions.
=== modified file 'src/window.c'
--- a/src/window.c 2012-11-06 13:26:20 +0000
+++ b/src/window.c 2012-11-06 15:57:14 +0000
@@ -602,15 +602,18 @@
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,
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r110814: * window.c (Fwindow_combination_limit): Revert to the only,
Dmitry Antipov <=