aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMartin Rudalics2012-12-22 11:12:52 +0100
committerMartin Rudalics2012-12-22 11:12:52 +0100
commit94900bfe14d9da2071e9cd5e1257ae21eeae41d9 (patch)
treece24453c9352b72ac6c15c3db2dbf01f9d8b737f /doc
parent160b3852018831b830a7451f29f770fb49810342 (diff)
downloademacs-94900bfe14d9da2071e9cd5e1257ae21eeae41d9.tar.gz
emacs-94900bfe14d9da2071e9cd5e1257ae21eeae41d9.zip
Reword doc and doc-string of select-window (Bug#13248).
* window.c (Fselect_window): Reword doc-string. * windows.texi (Selecting Windows): Reword description of select-window.
Diffstat (limited to 'doc')
-rw-r--r--doc/lispref/ChangeLog5
-rw-r--r--doc/lispref/windows.texi10
2 files changed, 11 insertions, 4 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 212e7c86e68..09c70226d5d 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
12012-12-22 Martin Rudalics <rudalics@gmx.at>
2
3 * windows.texi (Selecting Windows): Reword description of
4 select-window (Bug#13248).
5
12012-12-21 Chong Yidong <cyd@gnu.org> 62012-12-21 Chong Yidong <cyd@gnu.org>
2 7
3 * modes.texi (Auto Major Mode): Fix typo (Bug#13230). 8 * modes.texi (Auto Major Mode): Fix typo (Bug#13230).
diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi
index a3bbe192ad1..44d6af6eb52 100644
--- a/doc/lispref/windows.texi
+++ b/doc/lispref/windows.texi
@@ -1296,10 +1296,12 @@ windows.
1296@cindex selecting a window 1296@cindex selecting a window
1297 1297
1298@defun select-window window &optional norecord 1298@defun select-window window &optional norecord
1299This function makes @var{window} the selected window, as well as the 1299This function makes @var{window} the selected window and the window
1300window selected within its frame (@pxref{Basic Windows}). @var{window} 1300selected within its frame (@pxref{Basic Windows}) and selects that
1301must be a live window. This function makes also @var{window}'s buffer 1301frame. @var{window} must be a live window. This function also makes
1302current (@pxref{Buffers and Windows}). The return value is 1302@var{window}'s buffer (@pxref{Buffers and Windows}) current and sets
1303that buffer's value of @code{point} to the value of @code{window-point}
1304(@pxref{Window Point}) in @var{window}. The return value is
1303@var{window}. 1305@var{window}.
1304 1306
1305By default, this function also moves @var{window}'s buffer to the front 1307By default, this function also moves @var{window}'s buffer to the front