mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-30 04:10:54 -08:00
Code Issues Projects Releases Wiki Activity

* lisp/vc/vc-dispatcher.el (vc-command-messages): Add choice 'log'.

Browse source 
(vc-do-command): Don't display messages but only write them to the *Messages*
buffer when vc-command-messages is 'log' (bug#52518).
This commit is contained in:
Juri Linkov 2021-12-16 21:16:50 +02:00
parent 0b43e7a493
commit e726a00381
1 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

20
lisp/vc/vc-dispatcher.el
View file

@ -127,8 +127,11 @@ preserve the setting."
:group 'vc)
(defcustom vc-command-messages nil
"If non-nil, display run messages from back-end commands."
:type 'boolean
"If non-nil, display and log run messages from back-end commands.
If `log', messages are logged to the *Messages* buffer but not displayed."
:type '(choice (const :tag "No messages" nil)
(const :tag "Display and log messages" t)
(const :tag "Log messages" log))
:group 'vc)
(defcustom vc-suppress-confirm nil
@ -311,7 +314,10 @@ case, and the process object in the asynchronous case."
(substring command 0 -1)
command)
" " (vc-delistify flags)
" " (vc-delistify files))))
" " (vc-delistify files)))
(vc-inhibit-message
(or (eq vc-command-messages 'log)
(eq (selected-window) (active-minibuffer-window)))))
(save-current-buffer
(unless (or (eq buffer t)
(and (stringp buffer)
@ -335,7 +341,7 @@ case, and the process object in the asynchronous case."
(apply #'start-file-process command (current-buffer)
command squeezed))))
(when vc-command-messages
(let ((inhibit-message (eq (selected-window) (active-minibuffer-window))))
(let ((inhibit-message vc-inhibit-message))
(message "Running in background: %s" full-command)))
;; Get rid of the default message insertion, in case we don't
;; set a sentinel explicitly.
@ -345,11 +351,11 @@ case, and the process object in the asynchronous case."
(when vc-command-messages
(vc-run-delayed
(let ((message-truncate-lines t)
(inhibit-message (eq (selected-window) (active-minibuffer-window))))
(inhibit-message vc-inhibit-message))
(message "Done in background: %s" full-command)))))
;; Run synchronously
(when vc-command-messages
(let ((inhibit-message (eq (selected-window) (active-minibuffer-window))))
(let ((inhibit-message vc-inhibit-message))
(message "Running in foreground: %s" full-command)))
(let ((buffer-undo-list t))
(setq status (apply #'process-file command nil t nil squeezed)))
@ -364,7 +370,7 @@ case, and the process object in the asynchronous case."
(if (integerp status) (format "status %d" status) status)
full-command))
(when vc-command-messages
(let ((inhibit-message (eq (selected-window) (active-minibuffer-window))))
(let ((inhibit-message vc-inhibit-message))
(message "Done (status=%d): %s" status full-command)))))
(vc-run-delayed
(run-hook-with-args 'vc-post-command-functions