aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Rudalics2011-12-11 11:38:11 +0100
committerMartin Rudalics2011-12-11 11:38:11 +0100
commit9a9e9ef0e893d770d3c99b7fa9bb9f01ef64847b (patch)
tree499dee607374d6077ece0ff6921db5e306db9354
parent7b9d523a07395ecea505be88f45c33d73aea7038 (diff)
downloademacs-9a9e9ef0e893d770d3c99b7fa9bb9f01ef64847b.tar.gz
emacs-9a9e9ef0e893d770d3c99b7fa9bb9f01ef64847b.zip
Fix docstring of other-window.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/window.el6
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 @@
12011-12-11 Eric Hanchrow <eric.hanchrow@gmail.com>
2
3 * window.el (other-window): Fix docstring.
4
12011-12-10 Eli Zaretskii <eliz@gnu.org> 52011-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
2204window, so select the selected window. In an interactive call, 2204window, so select the selected window. In an interactive call,
2205COUNT is the numeric prefix argument. Return nil. 2205COUNT is the numeric prefix argument. Return nil.
2206 2206
2207If the `other-window' parameter of WINDOW is a function and 2207If the `other-window' parameter of the selected window is a
2208`ignore-window-parameters' is nil, call that function with the 2208function and `ignore-window-parameters' is nil, call that
2209arguments COUNT and ALL-FRAMES. 2209function with the arguments COUNT and ALL-FRAMES.
2210 2210
2211This function does not select a window whose `no-other-window' 2211This function does not select a window whose `no-other-window'
2212window parameter is non-nil. 2212window parameter is non-nil.