emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master 0a61a7c1fa: vc-do-command: Actually include "torsocks" in the com


From: Sean Whitton
Subject: master 0a61a7c1fa: vc-do-command: Actually include "torsocks" in the command
Date: Sat, 17 Sep 2022 21:01:38 -0400 (EDT)

branch: master
commit 0a61a7c1fa08478592dbadf91b7a0099d2b6e019
Author: Sean Whitton <spwhitton@spwhitton.name>
Commit: Sean Whitton <spwhitton@spwhitton.name>

    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).
---
 lisp/vc/vc-dispatcher.el | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lisp/vc/vc-dispatcher.el b/lisp/vc/vc-dispatcher.el
index f64809da61..88bf6627ae 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)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]