Merge from emacs-24; up to 2012-12-02T06:22:32Z!cyd@gnu.org

2 files changed, 9 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 19cb4935c7b..f8f0b82d3da 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-22  Eli Zaretskii  <eliz@gnu.org>
 
         * w32term.c (w32fullscreen_hook): New function.
diff --git a/src/window.c b/src/window.c
index 9571788798f..a7d30b7a467 100644
--- a/src/window.c
+++ b/src/window.c
@@ -566,9 +566,11 @@ select_window_1 (Lisp_Object window, bool 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