[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
emacs-28 f03c5d81bd: Fix ControlPath quoting in Tramp
From: |
Michael Albinus |
Subject: |
emacs-28 f03c5d81bd: Fix ControlPath quoting in Tramp |
Date: |
Thu, 12 May 2022 09:46:41 -0400 (EDT) |
branch: emacs-28
commit f03c5d81bd4a7af1364558b406e2b87a78b3af73
Author: Michael Albinus <michael.albinus@gmx.de>
Commit: Michael Albinus <michael.albinus@gmx.de>
Fix ControlPath quoting in Tramp
* lisp/net/tramp-sh.el (tramp-ssh-controlmaster-options):
Adapt docstring. Do not quote ControlPath. Reported by Daniel
Kessler <kesslerd@umich.edu>.
---
lisp/net/tramp-sh.el | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index c4fbe4673b..b0e98a31e1 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -115,7 +115,7 @@ configuration."
"Which ssh Control* arguments to use.
If it is a string, it should have the form
-\"-o ControlMaster=auto -o ControlPath=\\='tramp.%%r@%%h:%%p\\='
+\"-o ControlMaster=auto -o ControlPath=tramp.%%C
-o ControlPersist=no\". Percent characters in the ControlPath
spec must be doubled, because the string is used as format string.
@@ -4785,13 +4785,13 @@ Goes through the list `tramp-inline-compress-commands'."
(if (zerop
(tramp-call-process
vec "ssh" nil nil nil
- "-G" "-o" "ControlPath='tramp.%C'" "0.0.0.1"))
+ "-G" "-o" "ControlPath=tramp.%C" "0.0.0.1"))
(setq tramp-ssh-controlmaster-options
(concat tramp-ssh-controlmaster-options
- " -o ControlPath='tramp.%%C'"))
+ " -o ControlPath=tramp.%%C"))
(setq tramp-ssh-controlmaster-options
(concat tramp-ssh-controlmaster-options
- " -o ControlPath='tramp.%%r@%%h:%%p'")))
+ " -o ControlPath=tramp.%%r@%%h:%%p")))
(when (zerop
(tramp-call-process
vec "ssh" nil nil nil
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- emacs-28 f03c5d81bd: Fix ControlPath quoting in Tramp,
Michael Albinus <=