1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-29 19:48:19 +00:00

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>.
This commit is contained in:
Michael Albinus 2022-05-12 15:46:20 +02:00
parent 7b4bdf7b9b
commit f03c5d81bd

View File

@ -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