diff options
| author | Martin Rudalics <rudalics@gmx.at> | 2012-12-22 11:12:52 +0100 |
|---|---|---|
| committer | Martin Rudalics <rudalics@gmx.at> | 2012-12-22 11:12:52 +0100 |
| commit | 94900bfe14d9da2071e9cd5e1257ae21eeae41d9 (patch) | |
| tree | ce24453c9352b72ac6c15c3db2dbf01f9d8b737f /src | |
| parent | 160b3852018831b830a7451f29f770fb49810342 (diff) | |
| download | emacs-94900bfe14d9da2071e9cd5e1257ae21eeae41d9.tar.gz | |
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/ChangeLog | 4 | ||||
| -rw-r--r-- | src/window.c | 8 |
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 @@ +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 |