summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/emacs/windows.texi4
-rw-r--r--etc/NEWS10
-rw-r--r--lisp/frame.el7
-rw-r--r--lisp/term/ns-win.el2
4 files changed, 18 insertions, 5 deletions
diff --git a/doc/emacs/windows.texi b/doc/emacs/windows.texi
index 19f6cff7bf2..53e9a4bb584 100644
--- a/doc/emacs/windows.texi
+++ b/doc/emacs/windows.texi
@@ -181,12 +181,12 @@ the minibuffer window to one of the other windows, and later switch
back and finish supplying the minibuffer argument that is requested.
@xref{Minibuffer Edit}.
-@findex next-multiframe-window
+@findex next-window-any-frame
The @code{other-window} command will normally only switch to the next
window in the current frame (unless otherwise configured). If you
work in a multi-frame environment and you want windows in all frames
to be part of the cycle, you can rebind @kbd{C-x o} to the
-@code{next-multiframe-window} command. (@xref{Rebinding}, for how to
+@code{next-window-any-frame} command. (@xref{Rebinding}, for how to
rebind a command.)
@kindex C-M-v
diff --git a/etc/NEWS b/etc/NEWS
index a5b9dbdebd0..87aa5b5505f 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -202,6 +202,16 @@ the new version of the file again.)
* Changes in Emacs 27.1
++++
+** 'next/previous-multiframe-window' have been renamed.
+The new names are as follows:
+
+ 'next-multiframe-window' -> 'next-window-any-frame'
+ 'previous-multiframe-window' -> 'previous-window-any-frame'
+
+The old function names are maintained as aliases for backward
+compatibility.
+
** emacsclient
+++
diff --git a/lisp/frame.el b/lisp/frame.el
index 92fe57fbe63..1a15a4c9f26 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -673,7 +673,7 @@ Create one if necessary. Note that the minibuffer frame, if separate,
is not considered (see `next-frame')."
(if (equal (next-frame) (selected-frame)) (make-frame) (next-frame)))
-(defun next-multiframe-window ()
+(defun next-window-any-frame ()
"Select the next window, regardless of which frame it is on."
(interactive)
(select-window (next-window (selected-window)
@@ -681,7 +681,7 @@ is not considered (see `next-frame')."
0))
(select-frame-set-input-focus (selected-frame)))
-(defun previous-multiframe-window ()
+(defun previous-window-any-frame ()
"Select the previous window, regardless of which frame it is on."
(interactive)
(select-window (previous-window (selected-window)
@@ -689,6 +689,9 @@ is not considered (see `next-frame')."
0))
(select-frame-set-input-focus (selected-frame)))
+(defalias 'next-multiframe-window 'next-window-any-frame)
+(defalias 'previous-multiframe-window 'previous-window-any-frame)
+
(defun window-system-for-display (display)
"Return the window system for DISPLAY.
Return nil if we don't know how to interpret DISPLAY."
diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el
index 83b845b1a5a..1841e679ac8 100644
--- a/lisp/term/ns-win.el
+++ b/lisp/term/ns-win.el
@@ -102,7 +102,7 @@ The properties returned may include `top', `left', `height', and `width'."
;; Here are some Nextstep-like bindings for command key sequences.
(define-key global-map [?\s-,] 'customize)
-(define-key global-map [?\s-'] 'next-multiframe-window)
+(define-key global-map [?\s-'] 'next-window-any-frame)
(define-key global-map [?\s-`] 'other-frame)
(define-key global-map [?\s-~] 'ns-prev-frame)
(define-key global-map [?\s--] 'center-line)