Tramp: Fix file name quoting on MS Windows

* lisp/net/tramp-sh.el (tramp-make-copy-program-file-name):
Use `tramp-unquote-shell-quote-argument'.

* lisp/net/tramp.el (tramp-unquote-shell-quote-argument):
Adapt for MS Windows.

* test/lisp/net/tramp-tests.el (tramp--test-special-characters):
Adapt for MS Windows.

1 files changed, 7 insertions, 8 deletions

diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index 0f6f3b79800..03915d7a3fc 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -5882,6 +5882,7 @@ This requires restrictions of file name syntax."
             (make-directory tmp-name2)
 
             (dolist (elt files)
+              ;(tramp--test-message "%s" elt)
               (let* ((file1 (expand-file-name elt tmp-name1))
                      (file2 (expand-file-name elt tmp-name2))
                      (file3 (expand-file-name (concat elt "foo") tmp-name1)))
@@ -6071,7 +6072,8 @@ This requires restrictions of file name syntax."
                  "\tfoo bar baz\t")
                 (t " foo\tbar baz\t"))
           "@foo@bar@baz@"
-          "$foo$bar$$baz$"
+          (unless (tramp--test-windows-nt-and-scp-p)
+            "$foo$bar$$baz$")
           "-foo-bar-baz-"
           "%foo%bar%baz%"
           "&foo&bar&baz&"
@@ -6087,9 +6089,10 @@ This requires restrictions of file name syntax."
               "'foo'bar'baz'"
             "'foo\"bar'baz\"")
           "#foo~bar#baz~"
-          (if (or (tramp--test-gvfs-p) (tramp--test-windows-nt-or-smb-p))
-              "!foo!bar!baz!"
-            "!foo|bar!baz|")
+          (unless (tramp--test-windows-nt-and-scp-p)
+            (if (or (tramp--test-gvfs-p) (tramp--test-windows-nt-or-smb-p))
+                "!foo!bar!baz!"
+              "!foo|bar!baz|"))
           (if (or (tramp--test-gvfs-p)
                   (tramp--test-rclone-p)
                   (tramp--test-windows-nt-or-smb-p))
@@ -6110,7 +6113,6 @@ This requires restrictions of file name syntax."
   "Check special characters in file names."
   (skip-unless (tramp--test-enabled))
   (skip-unless (not (tramp--test-rsync-p)))
-;  (skip-unless (not (tramp--test-windows-nt-and-scp-p)))
   (skip-unless (or (tramp--test-emacs26-p) (not (tramp--test-rclone-p))))
 
   (tramp--test-special-characters))
@@ -6122,7 +6124,6 @@ Use the `stat' command."
   (skip-unless (tramp--test-enabled))
   (skip-unless (tramp--test-sh-p))
   (skip-unless (not (tramp--test-rsync-p)))
-;  (skip-unless (not (tramp--test-windows-nt-and-scp-p)))
   ;; We cannot use `tramp-test-vec', because this fails during compilation.
   (with-parsed-tramp-file-name tramp-test-temporary-file-directory nil
     (skip-unless (tramp-get-remote-stat v)))
@@ -6141,7 +6142,6 @@ Use the `perl' command."
   (skip-unless (tramp--test-enabled))
   (skip-unless (tramp--test-sh-p))
   (skip-unless (not (tramp--test-rsync-p)))
-;  (skip-unless (not (tramp--test-windows-nt-and-scp-p)))
   ;; We cannot use `tramp-test-vec', because this fails during compilation.
   (with-parsed-tramp-file-name tramp-test-temporary-file-directory nil
     (skip-unless (tramp-get-remote-perl v)))
@@ -6163,7 +6163,6 @@ Use the `ls' command."
   (skip-unless (tramp--test-enabled))
   (skip-unless (tramp--test-sh-p))
   (skip-unless (not (tramp--test-rsync-p)))
-;  (skip-unless (not (tramp--test-windows-nt-and-scp-p)))
 
   (let ((tramp-connection-properties
          (append