master 78996a113e: Merge from origin/emacs-28

[Stefan Kangas]

branch: master
commit 78996a113e3b70305afbec1e4220afe27ac8da92
Merge: 62636ea3c1 f03c5d81bd
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>

    Merge from origin/emacs-28
    
    f03c5d81bd Fix ControlPath quoting in Tramp
---
 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 1851047ccf..8f8b81186b 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -118,7 +118,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.
 
@@ -4779,13 +4779,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