diff options
| author | Glenn Morris <rgm@gnu.org> | 2012-12-22 11:09:52 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2012-12-22 11:09:52 -0800 |
| commit | 00afe3a454119390e78eaaa319a7d05e5e7723ae (patch) | |
| tree | 26e0f292873faadeb48d6ef73710f0e5a1b308ef /src/window.c | |
| parent | 04d9b71ab79f7773d9dba27ae2388a9e9ca563d4 (diff) | |
| parent | ddc412646dbcc51032cf438064d5eb4c8dded906 (diff) | |
| download | emacs-00afe3a454119390e78eaaa319a7d05e5e7723ae.tar.gz | |
Merge from emacs-24; up to 2012-12-02T06:22:32Z!cyd@gnu.org
Diffstat (limited to 'src/window.c')
| -rw-r--r-- | src/window.c | 8 |
1 files changed, 5 insertions, 3 deletions
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 |