diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2021-05-09 15:37:37 +0200 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2021-05-09 15:37:37 +0200 |
| commit | 515cac0dc046940bbbcb7deb5c7e8dcf8c785359 (patch) | |
| tree | d96cb5d5f2e7414c16b37aaf4ec492a39808196d /lisp/net/tramp.el | |
| parent | 457c44a2055f70dd02e8e34781d43fd24e2355ba (diff) | |
| download | emacs-515cac0dc046940bbbcb7deb5c7e8dcf8c785359.tar.gz emacs-515cac0dc046940bbbcb7deb5c7e8dcf8c785359.tar.bz2 emacs-515cac0dc046940bbbcb7deb5c7e8dcf8c785359.zip | |
Cleanups for Tramp out-of-band methods on MS Windows
* doc/misc/tramp.texi (Frequently Asked Questions):
tramp-use-ssh-controlmaster-options is nil on MS Windows.
* lisp/net/tramp.el (tramp-unquote-shell-quote-argument): Revert previous
change, it worked (not as expected but) properly.
* test/lisp/net/tramp-tests.el (tramp-test17-dired-with-wildcards):
Don't skip on MS Windows.
(tramp--test-windows-nt-and-scp-p): Remove.
(tramp--test-special-characters): Skip for out-of-band methods on
MS Windows, sometimes.
Diffstat (limited to 'lisp/net/tramp.el')
| -rw-r--r-- | lisp/net/tramp.el | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 5d62a1fb3d1..9fec1514221 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -5476,12 +5476,8 @@ T1 and T2 are time values (as returned by `current-time' for example)." "Remove quotation prefix \"/:\" from string S, and quote it then for shell. Suppress `shell-file-name'. This is needed on w32 systems, which would use a wrong quoting for local file names. See `w32-shell-name'." - (if (eq system-type 'windows-nt) - (let ((result (tramp-compat-file-name-unquote s))) - (setq result (tramp-compat-string-replace "\"" "\"\"" result)) - (concat "\"" result "\"")) - (let (shell-file-name) - (shell-quote-argument (tramp-compat-file-name-unquote s))))) + (let (shell-file-name) + (shell-quote-argument (tramp-compat-file-name-unquote s)))) ;; Currently (as of Emacs 20.5), the function `shell-quote-argument' ;; does not deal well with newline characters. Newline is replaced by |