aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMartin Rudalics2012-12-22 11:12:52 +0100
committerMartin Rudalics2012-12-22 11:12:52 +0100
commit94900bfe14d9da2071e9cd5e1257ae21eeae41d9 (patch)
treece24453c9352b72ac6c15c3db2dbf01f9d8b737f /src
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 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/window.c8
2 files changed, 9 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index e1017f3d037..e8d5449a99e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12012-12-22 Martin Rudalics <rudalics@gmx.at>
2
3 * window.c (Fselect_window): Reword doc-string (Bug#13248).
4
12012-12-21 Eli Zaretskii <eliz@gnu.org> 52012-12-21 Eli Zaretskii <eliz@gnu.org>
2 6
3 * fileio.c (Finsert_file_contents): Doc fix. 7 * 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)
523} 523}
524 524
525DEFUN ("select-window", Fselect_window, Sselect_window, 1, 2, 0, 525DEFUN ("select-window", Fselect_window, Sselect_window, 1, 2, 0,
526 doc: /* Select WINDOW. Most editing will apply to WINDOW's buffer. 526 doc: /* Select WINDOW which must be a live window.
527Also make WINDOW's buffer current and make WINDOW the frame's selected 527Also make WINDOW's frame the selected frame and WINDOW that frame's
528window. Return WINDOW. 528selected window. In addition, make WINDOW's buffer current and set that
529buffer's value of `point' to the value of WINDOW's `window-point'.
530Return WINDOW.
529 531
530Optional second arg NORECORD non-nil means do not put this buffer at the 532Optional second arg NORECORD non-nil means do not put this buffer at the
531front of the buffer list and do not make this window the most recently 533front of the buffer list and do not make this window the most recently