Commit 61356549 authored by Juri Linkov's avatar Juri Linkov

* lisp/vc/vc-dispatcher.el (vc-do-command): Let-bind inhibit-message to t

in active minibuffer.  (Bug#34939)
parent 82db17d0
Pipeline #1743 failed with stage
in 64 minutes and 12 seconds
......@@ -324,7 +324,8 @@ case, and the process object in the asynchronous case."
(apply 'start-file-process command (current-buffer)
command squeezed))))
(when vc-command-messages
(message "Running in background: %s" full-command))
(let ((inhibit-message (eq (selected-window) (active-minibuffer-window))))
(message "Running in background: %s" full-command)))
;; Get rid of the default message insertion, in case we don't
;; set a sentinel explicitly.
(set-process-sentinel proc #'ignore)
......@@ -332,11 +333,13 @@ case, and the process object in the asynchronous case."
(setq status proc)
(when vc-command-messages
(vc-run-delayed
(let ((message-truncate-lines t))
(let ((message-truncate-lines t)
(inhibit-message (eq (selected-window) (active-minibuffer-window))))
(message "Done in background: %s" full-command)))))
;; Run synchronously
(when vc-command-messages
(message "Running in foreground: %s" full-command))
(let ((inhibit-message (eq (selected-window) (active-minibuffer-window))))
(message "Running in foreground: %s" full-command)))
(let ((buffer-undo-list t))
(setq status (apply 'process-file command nil t nil squeezed)))
(when (and (not (eq t okstatus))
......@@ -350,7 +353,8 @@ case, and the process object in the asynchronous case."
(if (integerp status) (format "status %d" status) status)
full-command))
(when vc-command-messages
(message "Done (status=%d): %s" status full-command))))
(let ((inhibit-message (eq (selected-window) (active-minibuffer-window))))
(message "Done (status=%d): %s" status full-command)))))
(vc-run-delayed
(run-hook-with-args 'vc-post-command-functions
command file-or-list flags))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment