diff options
| author | Yuuki Harano <masm+github@masm11.me> | 2020-12-27 03:13:00 +0900 |
|---|---|---|
| committer | Yuuki Harano <masm+github@masm11.me> | 2020-12-27 03:13:00 +0900 |
| commit | b64089c37b4305a511e5ddbf02746862c7c7575e (patch) | |
| tree | c6978d471e4b0b061b7cc9c46147968379aec94f /lisp/server.el | |
| parent | 565d8f57d349c19d9bbb5d5d5fdacf3c70b85d42 (diff) | |
| parent | 4b2ca6bfc079c66cfcf39f2f36dc139012787535 (diff) | |
| download | emacs-b64089c37b4305a511e5ddbf02746862c7c7575e.tar.gz emacs-b64089c37b4305a511e5ddbf02746862c7c7575e.tar.bz2 emacs-b64089c37b4305a511e5ddbf02746862c7c7575e.zip | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs into feature/pgtk
Diffstat (limited to 'lisp/server.el')
| -rw-r--r-- | lisp/server.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/server.el b/lisp/server.el index af752a4d4f7..4db71230cf1 100644 --- a/lisp/server.el +++ b/lisp/server.el @@ -1332,8 +1332,6 @@ The following commands are accepted by the client: (t (server-return-error proc err)))) (defun server-execute (proc files nowait commands dontkill frame tty-name) - (when server-raise-frame - (select-frame-set-input-focus (or frame (selected-frame)))) ;; This is run from timers and process-filters, i.e. "asynchronously". ;; But w.r.t the user, this is not really asynchronous since the timer ;; is run after 0s and the process-filter is run in response to the @@ -1693,7 +1691,9 @@ be a cons cell (LINENUMBER . COLUMNNUMBER)." (switch-to-buffer next-buffer)) ;; After all the above, we might still have ended up with ;; a minibuffer/dedicated-window (if there's no other). - (error (pop-to-buffer next-buffer))))))))) + (error (pop-to-buffer next-buffer))))))) + (when server-raise-frame + (select-frame-set-input-focus (window-frame))))) ;;;###autoload (defun server-save-buffers-kill-terminal (arg) |