From 0a80b3c71ac52829bc89036f070f1fb5632ea889 Mon Sep 17 00:00:00 2001 From: memeplex Date: Mon, 21 Oct 2019 05:12:48 -0300 Subject: [PATCH] Avoid autoraising frame when tty client is run (Bug#37826) * lisp/server.el (server-visit-files): Narrow scope of minibuffer-auto-rise. --- lisp/server.el | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/lisp/server.el b/lisp/server.el index 45fa55ad6b..46c76895e9 100644 --- a/lisp/server.el +++ b/lisp/server.el @@ -1397,9 +1397,7 @@ server-visit-files ;; If there is an existing buffer modified or the file is ;; modified, revert it. If there is an existing buffer with ;; deleted file, offer to write it. - (let* ((minibuffer-auto-raise (or server-raise-frame - minibuffer-auto-raise)) - (filen (car file)) + (let* ((filen (car file)) (obuf (get-file-buffer filen))) (add-to-history 'file-name-history filen) (if (null obuf) @@ -1410,14 +1408,16 @@ server-visit-files ;; separately for each file, in sync with post-command hooks, ;; with the new buffer current: (run-hooks 'pre-command-hook) - (cond ((file-exists-p filen) - (when (not (verify-visited-file-modtime obuf)) - (revert-buffer t nil))) - (t - (when (y-or-n-p - (concat "File no longer exists: " filen - ", write buffer to file? ")) - (write-file filen)))) + (let ((minibuffer-auto-raise (or server-raise-frame + minibuffer-auto-raise))) + (cond ((file-exists-p filen) + (when (not (verify-visited-file-modtime obuf)) + (revert-buffer t nil))) + (t + (when (y-or-n-p + (concat "File no longer exists: " filen + ", write buffer to file? ")) + (write-file filen))))) (unless server-buffer-clients (setq server-existing-buffer t))) (server-goto-line-column (cdr file)) -- 2.20.1