[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r106449: Remove term "status" with "w
From: |
martin rudalics |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r106449: Remove term "status" with "window combination limits". |
Date: |
Sun, 20 Nov 2011 11:57:04 +0100 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 106449
committer: martin rudalics <address@hidden>
branch nick: trunk
timestamp: Sun 2011-11-20 11:57:04 +0100
message:
Remove term "status" with "window combination limits".
* window.c (Fset_window_combination_limit): Rename argument
STATUS to LIMIT.
(Vwindow_combination_limit): Remove "status" from doc-string.
* windows.texi (Resizing Windows, Splitting Windows): Remove
term "status" when talking about combination limits.
modified:
doc/lispref/ChangeLog
doc/lispref/windows.texi
src/ChangeLog
src/window.c
=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog 2011-11-20 03:48:53 +0000
+++ b/doc/lispref/ChangeLog 2011-11-20 10:57:04 +0000
@@ -1,3 +1,8 @@
+2011-11-20 Martin Rudalics <address@hidden>
+
+ * windows.texi (Resizing Windows, Splitting Windows): Remove
+ term "status" when talking about combination limits.
+
2011-11-20 Juanma Barranquero <address@hidden>
* compile.texi (Compiler Errors):
=== modified file 'doc/lispref/windows.texi'
--- a/doc/lispref/windows.texi 2011-11-19 11:11:38 +0000
+++ b/doc/lispref/windows.texi 2011-11-20 10:57:04 +0000
@@ -635,9 +635,9 @@
The choice of which window edges this function alters depends on the
values of the option @code{window-combination-resize} and the
-combination-limit status of the involved windows; in some cases, it may
-alter both edges. @xref{Splitting Windows}. To resize by moving only
-the bottom or right edge of a window, use the function
+combination limits of the involved windows; in some cases, it may alter
+both edges. @xref{Splitting Windows}. To resize by moving only the
+bottom or right edge of a window, use the function
@code{adjust-window-trailing-edge}, below.
@end defun
@@ -954,14 +954,14 @@
@end defopt
@cindex window combination limit
address@hidden set-window-combination-limit window status
address@hidden set-window-combination-limit window limit
This functions sets the @dfn{combination limit} of the window
address@hidden to @var{status}. This value can be retrieved via the
address@hidden to @var{limit}. This value can be retrieved via the
function @code{window-combination-limit}. See below for its effects;
note that it is only meaningful for internal windows. The
address@hidden function automatically calls this function,
-passing the value of the variable @code{window-combination-limit} as
address@hidden
address@hidden function automatically calls this function, passing
+the value of the variable @code{window-combination-limit} as
address@hidden
@end defun
@defun window-combination-limit window
@@ -973,7 +973,7 @@
child windows of @var{window} with the child windows of one of its
siblings to form a new window combination. If the combination limit
is @code{t}, the child windows of @var{window} are never automatically
-re-combined with its siblings'.
+re-combined with its siblings.
@end defun
To illustrate the effect of @code{window-combination-limit},
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2011-11-20 09:24:06 +0000
+++ b/src/ChangeLog 2011-11-20 10:57:04 +0000
@@ -1,3 +1,9 @@
+2011-11-20 Martin Rudalics <address@hidden>
+
+ * window.c (Fset_window_combination_limit): Rename argument
+ STATUS to LIMIT.
+ (Vwindow_combination_limit): Remove "status" from doc-string.
+
2011-11-20 Andreas Schwab <address@hidden>
* m/ibms390.h: Remove.
=== modified file 'src/window.c'
--- a/src/window.c 2011-11-19 15:50:23 +0000
+++ b/src/window.c 2011-11-20 10:57:04 +0000
@@ -476,16 +476,16 @@
}
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 STATUS is nil, child windows of WINDOW can be recombined with
-WINDOW's siblings. STATUS t means that child windows of WINDOW are
+ doc: /* Set combination limit of window WINDOW to LIMIT; return LIMIT.
+If LIMIT is nil, child windows of WINDOW can be recombined with
+WINDOW's siblings. LIMIT t means that child windows of WINDOW are
never \(re-)combined with WINDOW's siblings. Other values are reserved
for future use. */)
- (Lisp_Object window, Lisp_Object status)
+ (Lisp_Object window, Lisp_Object limit)
{
register struct window *w = decode_any_window (window);
- w->combination_limit = status;
+ w->combination_limit = limit;
return w->combination_limit;
}
@@ -6532,10 +6532,10 @@
Other values are reserved for future use.
-The value of this variable is also assigned to the combination-limit
-status of the new parent window. The combination-limit status of a
-window can be retrieved via the function `window-combination-limit' and
-altered by the function `set-window-combination-limit'. */);
+The value of this variable is also assigned to the combination limit of
+the new parent window. The combination limit of a window can be
+retrieved via the function `window-combination-limit' and altered by the
+function `set-window-combination-limit'. */);
Vwindow_combination_limit = Qnil;
defsubr (&Sselected_window);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r106449: Remove term "status" with "window combination limits".,
martin rudalics <=