diff options
| author | Martin Rudalics | 2011-12-11 11:38:11 +0100 |
|---|---|---|
| committer | Martin Rudalics | 2011-12-11 11:38:11 +0100 |
| commit | 9a9e9ef0e893d770d3c99b7fa9bb9f01ef64847b (patch) | |
| tree | 499dee607374d6077ece0ff6921db5e306db9354 | |
| parent | 7b9d523a07395ecea505be88f45c33d73aea7038 (diff) | |
| download | emacs-9a9e9ef0e893d770d3c99b7fa9bb9f01ef64847b.tar.gz emacs-9a9e9ef0e893d770d3c99b7fa9bb9f01ef64847b.zip | |
Fix docstring of other-window.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/window.el | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 024131569dc..a22655727d9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2011-12-11 Eric Hanchrow <eric.hanchrow@gmail.com> | ||
| 2 | |||
| 3 | * window.el (other-window): Fix docstring. | ||
| 4 | |||
| 1 | 2011-12-10 Eli Zaretskii <eliz@gnu.org> | 5 | 2011-12-10 Eli Zaretskii <eliz@gnu.org> |
| 2 | 6 | ||
| 3 | * mail/rmailsum.el (rmail-header-summary): RFC2047 decode the | 7 | * mail/rmailsum.el (rmail-header-summary): RFC2047 decode the |
diff --git a/lisp/window.el b/lisp/window.el index 138fb7bcb2a..4838dfa7969 100644 --- a/lisp/window.el +++ b/lisp/window.el | |||
| @@ -2204,9 +2204,9 @@ skip -COUNT windows backwards. COUNT zero means do not skip any | |||
| 2204 | window, so select the selected window. In an interactive call, | 2204 | window, so select the selected window. In an interactive call, |
| 2205 | COUNT is the numeric prefix argument. Return nil. | 2205 | COUNT is the numeric prefix argument. Return nil. |
| 2206 | 2206 | ||
| 2207 | If the `other-window' parameter of WINDOW is a function and | 2207 | If the `other-window' parameter of the selected window is a |
| 2208 | `ignore-window-parameters' is nil, call that function with the | 2208 | function and `ignore-window-parameters' is nil, call that |
| 2209 | arguments COUNT and ALL-FRAMES. | 2209 | function with the arguments COUNT and ALL-FRAMES. |
| 2210 | 2210 | ||
| 2211 | This function does not select a window whose `no-other-window' | 2211 | This function does not select a window whose `no-other-window' |
| 2212 | window parameter is non-nil. | 2212 | window parameter is non-nil. |