summaryrefslogtreecommitdiff
path: root/lisp/frame.el
diff options
context:
space:
mode:
authorNoam Postavsky <npostavs@gmail.com>2017-09-01 09:38:55 -0400
committerNoam Postavsky <npostavs@gmail.com>2017-10-15 13:58:45 -0400
commit616b4c59561c63b986634d666c45a73e95fac392 (patch)
tree3f9feecb986003a6d54ae8b18eff259cebe4abde /lisp/frame.el
parent8eb3c01dbd2ed0bd54a18ab0a13cfc262b21b45e (diff)
downloademacs-616b4c59561c63b986634d666c45a73e95fac392.tar.gz
Let select-frame-by-name choose any frame when called from lisp (Bug#25521)
* lisp/frame.el (select-frame-by-name): Choose from the whole list of frames in the non-interactive part, if not found on the current display.
Diffstat (limited to 'lisp/frame.el')
-rw-r--r--lisp/frame.el16
1 files changed, 10 insertions, 6 deletions
diff --git a/lisp/frame.el b/lisp/frame.el
index f8aa5c6e523..b6c066462b0 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -892,7 +892,8 @@ Calls `suspend-emacs' if invoked from the controlling tty device,
(defvar frame-name-history nil)
(defun select-frame-by-name (name)
- "Select the frame on the current terminal whose name is NAME and raise it.
+ "Select the frame whose name is NAME and raise it.
+Frames on the current terminal are checked first.
If there is no frame by that name, signal an error."
(interactive
(let* ((frame-names-alist (make-frame-names-alist))
@@ -903,11 +904,14 @@ If there is no frame by that name, signal an error."
(if (= (length input) 0)
(list default)
(list input))))
- (let* ((frame-names-alist (make-frame-names-alist))
- (frame (cdr (assoc name frame-names-alist))))
- (if frame
- (select-frame-set-input-focus frame)
- (error "There is no frame named `%s'" name))))
+ (select-frame-set-input-focus
+ ;; Prefer frames on the current display.
+ (or (cdr (assoc name (make-frame-names-alist)))
+ (catch 'done
+ (dolist (frame (frame-list))
+ (when (equal (frame-parameter frame 'name) name)
+ (throw 'done frame))))
+ (error "There is no frame named `%s'" name))))
;;;; Background mode.