diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2022-09-16 16:18:35 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2022-09-17 17:57:56 -0700 |
| commit | 0a61a7c1fa08478592dbadf91b7a0099d2b6e019 (patch) | |
| tree | 4538c0b6ff4f914d2988b69fdeb68f587671b4e3 | |
| parent | 2f7139a15c7877b0fd85b530067de16efab88c20 (diff) | |
| download | emacs-0a61a7c1fa08478592dbadf91b7a0099d2b6e019.tar.gz | |
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).
| -rw-r--r-- | lisp/vc/vc-dispatcher.el | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/vc/vc-dispatcher.el b/lisp/vc/vc-dispatcher.el index f64809da616..88bf6627ae6 100644 --- 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) |