; Fix documentation of 'other-window'

* doc/lispref/windows.texi (Cyclic Window Ordering):
* lisp/window.el (other-window): Document ALL-FRAMES in interactive
invocations.

(cherry picked from commit e4908623f2351fe00332fba461b779c9a41a70a1)

diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi
index 87dfaad7fda74cb3bd6651bf49da4b140b8d634f..78962cf17dd4d8c033cd685c036a12a3d16dc0af 100644 (file)
--- a/doc/lispref/windows.texi
+++ b/doc/lispref/windows.texi
@@ -2490,7 +2490,9 @@ argument.
 
 The optional argument @var{all-frames} has the same meaning as in
 @code{next-window}, like a @code{nil} @var{minibuf} argument to
-@code{next-window}.
+@code{next-window}.  When called interactively, @var{all-frames} is
+always @code{nil}, so only windows on the selected frame can be
+selected.
 
 If the @code{other-window} parameter of the selected window is a
 function, and @code{ignore-window-parameters} is @code{nil}, that

diff --git a/lisp/window.el b/lisp/window.el
index d14ca0d0a43286210c90260562aab9e7a381148c..f44776d2beaeb6cf24a17e7ec61907aac6c22be8 100644 (file)
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -3958,7 +3958,8 @@ COUNT and ALL-FRAMES.  Otherwise, do not return a window for which
 This function uses `next-window' for finding the window to
 select.  The argument ALL-FRAMES has the same meaning as in
 `next-window', but the MINIBUF argument of `next-window' is
-always effectively nil."
+always effectively nil.  Interactively, ALL-FRAMES is always
+nil, which considers all windows on the selected frame."
   (interactive "p\ni\np")
   (let* ((window (selected-window))
          (original-window window)