vc-do-command: Actually include "torsocks" in the command

* lisp/vc/vc-dispatcher.el (vc-do-command): When vc-tor is non-nil,
actually include "torsocks" in the command to be run (bug#57870).

diff --git a/lisp/vc/vc-dispatcher.el b/lisp/vc/vc-dispatcher.el
index f64809da61615e0b7b27870a8df0b76f49d30543..88bf6627ae66205d9ccef4aabcf8e33eda8632be 100644 (file)
--- a/lisp/vc/vc-dispatcher.el
+++ b/lisp/vc/vc-dispatcher.el
@@ -298,6 +298,9 @@ name or set of files).  If an optional list of FLAGS is present,
 that is inserted into the command line before the filename.
 Return the return value of the slave command in the synchronous
 case, and the process object in the asynchronous case."
+  (when vc-tor
+    (push command flags)
+    (setq command "torsocks"))
   ;; FIXME: file-relative-name can return a bogus result because
   ;; it doesn't look at the actual file-system to see if symlinks
   ;; come into play.
@@ -310,8 +313,7 @@ case, and the process object in the asynchronous case."
         ;; due to potential truncation of long messages.
         (message-truncate-lines t)
         (full-command
-         (concat (if vc-tor "torsocks " "")
-                  (if (string= (substring command -1) "\n")
+         (concat (if (string= (substring command -1) "\n")
                      (substring command 0 -1)
                    command)
                  " " (vc-delistify flags)