diff options
| author | Stefan Kangas <stefankangas@gmail.com> | 2019-11-06 00:49:02 +0100 |
|---|---|---|
| committer | Stefan Kangas <stefankangas@gmail.com> | 2019-11-06 00:49:19 +0100 |
| commit | c91c145d61cb53cb9f88686cbde4aaf6d9c42794 (patch) | |
| tree | c9e7dd4103fa32a96c8480aa7bb929a6885ebc61 /lisp | |
| parent | a8dbb7cc865f227a39708df3fe8d24e6f52b6e28 (diff) | |
| download | emacs-c91c145d61cb53cb9f88686cbde4aaf6d9c42794.tar.gz emacs-c91c145d61cb53cb9f88686cbde4aaf6d9c42794.tar.bz2 emacs-c91c145d61cb53cb9f88686cbde4aaf6d9c42794.zip | |
Rename *-multiframe-window to *-window-any-frame
Suggested by Drew Adams.
* lisp/frame.el
(next-multiframe-window): Define as obsolete alias for...
(next-window-any-frame): ...new function name.
(previous-multiframe-window): Define as obsolete alias for...
(previous-window-any-frame): ...new function name. (Bug#12436)
* lisp/term/ns-win.el (global-map): Use new command name.
* doc/emacs/windows.texi (Other Window): Document it.
* etc/NEWS: Announce it.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/frame.el | 7 | ||||
| -rw-r--r-- | lisp/term/ns-win.el | 2 |
2 files changed, 6 insertions, 3 deletions
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) |