[Emacs-diffs] /srv/bzr/emacs/emacs-24 r111058: Reword doc and doc-string of select-window (Bug#13248).

[martin rudalics]

------------------------------------------------------------
revno: 111058
committer: martin rudalics <address@hidden>
branch nick: emacs-24
timestamp: Sat 2012-12-22 11:12:52 +0100
message:
  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.
modified:
  doc/lispref/ChangeLog
  doc/lispref/windows.texi
  src/ChangeLog
  src/window.c

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2012-12-21 07:56:47 +0000
+++ b/doc/lispref/ChangeLog     2012-12-22 10:12:52 +0000
@@ -1,3 +1,8 @@
+2012-12-22  Martin Rudalics  <address@hidden>
+
+       * windows.texi (Selecting Windows): Reword description of
+       select-window (Bug#13248).
+
 2012-12-21  Chong Yidong  <address@hidden>
 
        * modes.texi (Auto Major Mode): Fix typo (Bug#13230).

=== modified file 'doc/lispref/windows.texi'
--- a/doc/lispref/windows.texi  2012-12-05 22:27:56 +0000
+++ b/doc/lispref/windows.texi  2012-12-22 10:12:52 +0000
@@ -1296,10 +1296,12 @@
 @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
address@hidden'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

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-12-21 11:52:18 +0000
+++ b/src/ChangeLog     2012-12-22 10:12:52 +0000
@@ -1,3 +1,7 @@
+2012-12-22  Martin Rudalics  <address@hidden>
+
+       * window.c (Fselect_window): Reword doc-string (Bug#13248).
+
 2012-12-21  Eli Zaretskii  <address@hidden>
 
        * fileio.c (Finsert_file_contents): Doc fix.

=== modified file 'src/window.c'
--- a/src/window.c      2012-11-07 09:41:52 +0000
+++ b/src/window.c      2012-12-22 10:12:52 +0000
@@ -523,9 +523,11 @@
 }
 
 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