diff options
| author | Xue Fuqiao | 2013-07-16 14:45:01 +0800 |
|---|---|---|
| committer | Xue Fuqiao | 2013-07-16 14:45:01 +0800 |
| commit | e6c005c5f8e39252fd11821b6452843bead2df6a (patch) | |
| tree | 7f03acf8ff855d8a5a30ce518adcd20c8e807784 | |
| parent | 6c6f1994bf684f510d600bd18023fa01b4b06500 (diff) | |
| download | emacs-e6c005c5f8e39252fd11821b6452843bead2df6a.tar.gz emacs-e6c005c5f8e39252fd11821b6452843bead2df6a.zip | |
Fix the introduction of `set-frame-selected-window''s arguments.
* doc/lispref/windows.texi (Selecting Windows): Fix the introduction of `set-frame-selected-window''s arguments.
| -rw-r--r-- | doc/lispref/ChangeLog | 5 | ||||
| -rw-r--r-- | doc/lispref/windows.texi | 7 |
2 files changed, 8 insertions, 4 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index f8b7406c427..d2480cbad8b 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-07-16 Xue Fuqiao <xfq.free@gmail.com> | ||
| 2 | |||
| 3 | * windows.texi (Selecting Windows): Fix the introduction of | ||
| 4 | `set-frame-selected-window''s arguments. | ||
| 5 | |||
| 1 | 2013-07-10 Paul Eggert <eggert@cs.ucla.edu> | 6 | 2013-07-10 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 7 | ||
| 3 | Timestamp fixes for undo (Bug#14824). | 8 | Timestamp fixes for undo (Bug#14824). |
diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi index f2a4b3849dd..4cd525f6000 100644 --- a/doc/lispref/windows.texi +++ b/doc/lispref/windows.texi | |||
| @@ -1355,10 +1355,9 @@ within that frame. @var{frame} should be a live frame; if omitted or | |||
| 1355 | 1355 | ||
| 1356 | @defun set-frame-selected-window frame window &optional norecord | 1356 | @defun set-frame-selected-window frame window &optional norecord |
| 1357 | This function makes @var{window} the window selected within the frame | 1357 | This function makes @var{window} the window selected within the frame |
| 1358 | @var{frame}. @var{frame} should be a live frame; if omitted or | 1358 | @var{frame}. @var{frame} should be a live frame; if @code{nil}, it |
| 1359 | @code{nil}, it defaults to the selected frame. @var{window} should be | 1359 | defaults to the selected frame. @var{window} should be a live window; |
| 1360 | a live window; if omitted or @code{nil}, it defaults to the selected | 1360 | if @code{nil}, it defaults to the selected window. |
| 1361 | window. | ||
| 1362 | 1361 | ||
| 1363 | If @var{frame} is the selected frame, this makes @var{window} the | 1362 | If @var{frame} is the selected frame, this makes @var{window} the |
| 1364 | selected window. | 1363 | selected window. |