diff options
Diffstat (limited to 'lisp')
| -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 @@ +2011-12-11 Eric Hanchrow <eric.hanchrow@gmail.com> + + * window.el (other-window): Fix docstring. + 2011-12-10 Eli Zaretskii <eliz@gnu.org> * 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 window, so select the selected window. In an interactive call, COUNT is the numeric prefix argument. Return nil. -If the `other-window' parameter of WINDOW is a function and -`ignore-window-parameters' is nil, call that function with the -arguments COUNT and ALL-FRAMES. +If the `other-window' parameter of the selected window is a +function and `ignore-window-parameters' is nil, call that +function with the arguments COUNT and ALL-FRAMES. This function does not select a window whose `no-other-window' window parameter is non-nil. |