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.

4 files changed, 20 insertions, 7 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 @@
+2012-12-22  Martin Rudalics  <rudalics@gmx.at>
+
+	* windows.texi (Selecting Windows): Reword description of
+	select-window (Bug#13248).
+
 2012-12-21  Chong Yidong  <cyd@gnu.org>
 
 	* 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.
 @cindex selecting a window
 
 @defun select-window window &optional norecord
-This function makes @var{window} the selected window, as well as the
-window selected within its frame (@pxref{Basic Windows}).  @var{window}
-must be a live window.  This function makes also @var{window}'s buffer
-current (@pxref{Buffers and Windows}).  The return value is
+This function makes @var{window} the selected window and the window
+selected within its frame (@pxref{Basic Windows}) and selects that
+frame.  @var{window} must be a live window.  This function also makes
+@var{window}'s buffer (@pxref{Buffers and Windows}) current and sets
+that buffer's value of @code{point} to the value of @code{window-point}
+(@pxref{Window Point}) in @var{window}.  The return value is
 @var{window}.
 
 By default, this function also moves @var{window}'s buffer to the front
diff --git a/src/ChangeLog b/src/ChangeLog
index e1017f3d037..e8d5449a99e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2012-12-22  Martin Rudalics  <rudalics@gmx.at>
+
+	* window.c (Fselect_window): Reword doc-string (Bug#13248).
+
 2012-12-21  Eli Zaretskii  <eliz@gnu.org>
 
 	* fileio.c (Finsert_file_contents): Doc fix.
diff --git a/src/window.c b/src/window.c
index 4981b8cd7c0..95ad76d6774 100644
--- a/src/window.c
+++ b/src/window.c
@@ -523,9 +523,11 @@ select_window (Lisp_Object window, Lisp_Object norecord, int inhibit_point_swap)
 }
 
 DEFUN ("select-window", Fselect_window, Sselect_window, 1, 2, 0,
-       doc: /* Select WINDOW.  Most editing will apply to WINDOW's buffer.
-Also make WINDOW's buffer current and make WINDOW the frame's selected
-window.  Return WINDOW.
+       doc: /* Select WINDOW which must be a live window.
+Also make WINDOW's frame the selected frame and WINDOW that frame's
+selected window.  In addition, make WINDOW's buffer current and set that
+buffer's value of `point' to the value of WINDOW's `window-point'.
+Return WINDOW.
 
 Optional second arg NORECORD non-nil means do not put this buffer at the
 front of the buffer list and do not make this window the most recently