aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Rudalics2012-08-21 11:50:58 +0200
committerMartin Rudalics2012-08-21 11:50:58 +0200
commit342dac71b199ededa5fe250b6cf12775394112b7 (patch)
treedc48f248e93d1c6d23fd86bff4a04d2d08916b37
parent5481664ac42e532f7636941e29cf31b3163587c6 (diff)
downloademacs-342dac71b199ededa5fe250b6cf12775394112b7.tar.gz
emacs-342dac71b199ededa5fe250b6cf12775394112b7.zip
Document recent changes for select-window, window-point and set-window-point.
* windows.texi (Window Point): Document recent changes in window-point and set-window-point. (Selecting Windows): Document recent change in select-window.
-rw-r--r--doc/lispref/ChangeLog6
-rw-r--r--doc/lispref/windows.texi30
2 files changed, 20 insertions, 16 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 6579cc48fd5..c014c0fce45 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,9 @@
12012-08-21 Martin Rudalics <rudalics@gmx.at>
2
3 * windows.texi (Window Point): Document recent changes in
4 window-point and set-window-point.
5 (Selecting Windows): Document recent change in select-window.
6
12012-08-06 Eli Zaretskii <eliz@gnu.org> 72012-08-06 Eli Zaretskii <eliz@gnu.org>
2 8
3 * functions.texi (Closures): Put the main index entry for 9 * functions.texi (Closures): Put the main index entry for
diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi
index c7c466c7d36..ba2a944215d 100644
--- a/doc/lispref/windows.texi
+++ b/doc/lispref/windows.texi
@@ -1129,16 +1129,15 @@ are the opposite of what they are in those other functions.
1129 1129
1130@defun select-window window &optional norecord 1130@defun select-window window &optional norecord
1131This function makes @var{window} the selected window, as well as the 1131This function makes @var{window} the selected window, as well as the
1132window selected within its frame (@pxref{Basic Windows}). 1132window selected within its frame (@pxref{Basic Windows}). @var{window}
1133@var{window} must be a live window. Unless @var{window} already is the 1133must be a live window. This function makes also @var{window}'s buffer
1134selected window, its buffer becomes the current buffer (@pxref{Buffers 1134current (@pxref{Buffers and Windows}). The return value is
1135and Windows}). The return value is @var{window}. 1135@var{window}.
1136 1136
1137By default, this function also moves @var{window}'s selected buffer to 1137By default, this function also moves @var{window}'s buffer to the front
1138the front of the buffer list (@pxref{The Buffer List}), and makes 1138of the buffer list (@pxref{The Buffer List}), and makes @var{window} the
1139@var{window} the most recently selected window. However, if the 1139most recently selected window. However, if the optional argument
1140optional argument @var{norecord} is non-@code{nil}, these additional 1140@var{norecord} is non-@code{nil}, these additional actions are omitted.
1141actions are omitted.
1142@end defun 1141@end defun
1143 1142
1144@cindex most recently selected windows 1143@cindex most recently selected windows
@@ -2276,19 +2275,18 @@ For a nonselected window, this is the value point would have (in that
2276window's buffer) if that window were selected. The default for 2275window's buffer) if that window were selected. The default for
2277@var{window} is the selected window. 2276@var{window} is the selected window.
2278 2277
2279When @var{window} is the selected window and its buffer is also the 2278When @var{window} is the selected window, the value returned is the
2280current buffer, the value returned is the same as point in that buffer. 2279value of point in that window's buffer. Strictly speaking, it would be
2281Strictly speaking, it would be more correct to return the ``top-level'' 2280more correct to return the ``top-level'' value of point, outside of any
2282value of point, outside of any @code{save-excursion} forms. But that 2281@code{save-excursion} forms. But that value is hard to find.
2283value is hard to find.
2284@end defun 2282@end defun
2285 2283
2286@defun set-window-point window position 2284@defun set-window-point window position
2287This function positions point in @var{window} at position 2285This function positions point in @var{window} at position
2288@var{position} in @var{window}'s buffer. It returns @var{position}. 2286@var{position} in @var{window}'s buffer. It returns @var{position}.
2289 2287
2290If @var{window} is selected, and its buffer is current, 2288If @var{window} is selected, this simply does @code{goto-char} in
2291this simply does @code{goto-char}. 2289@var{window}'s buffer.
2292@end defun 2290@end defun
2293 2291
2294@defvar window-point-insertion-type 2292@defvar window-point-insertion-type