1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-02-01 20:06:00 +00:00

* lisp/frameset.el (frameset-restore): Make sure last-focus frame has focus.

Call select-frame-set-input-focus to restore focus on the frame
that had last-focus-update frame parameter before saving frameset.
(Bug#36894)
This commit is contained in:
Juri Linkov 2019-08-18 01:40:32 +03:00
parent c81c041f60
commit 6616806896

View File

@ -1346,6 +1346,16 @@ All keyword parameters default to nil."
(error
(delay-warning 'frameset (error-message-string err) :warning))))))
;; Make sure the frame with last-focus-update has focus.
(let ((last-focus-frame
(catch 'last-focus
(maphash (lambda (frame _)
(when (frame-parameter frame 'last-focus-update)
(throw 'last-focus frame)))
frameset--action-map))))
(when last-focus-frame
(select-frame-set-input-focus last-focus-frame)))
;; Make sure there's at least one visible frame.
(unless (or (daemonp)
(catch 'visible