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

(vc-do-command): Don't display messages but only write them to the *Messages*
buffer when vc-command-messages is 'log' (bug#52518).

diff --git a/lisp/vc/vc-dispatcher.el b/lisp/vc/vc-dispatcher.el
index 346974bdba8b9ebabbffb44afd9b5288372e2a3c..f4d280c14630de0ed0b886560b8e9725db9e2f9b 100644 (file)
--- a/lisp/vc/vc-dispatcher.el
+++ b/lisp/vc/vc-dispatcher.el
@@ -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