summaryrefslogtreecommitdiff
path: root/lisp/net/tramp-integration.el
diff options
context:
space:
mode:
authorMichael Albinus <michael.albinus@gmx.de>2019-06-10 17:48:08 +0200
committerMichael Albinus <michael.albinus@gmx.de>2019-06-10 17:48:08 +0200
commitfb39d31e45ec766421f3ba3e5792b5f0365741c2 (patch)
tree60c5526584d92fb8b38148ec28330f6c189937af /lisp/net/tramp-integration.el
parentf2e4c34de699456b2ef020c1ee5b17223351c370 (diff)
downloademacs-fb39d31e45ec766421f3ba3e5792b5f0365741c2.tar.gz
Fix quoting problem in Tramp on w32 systems
* lisp/net/tramp-adb.el (tramp-adb-connection-local-default-profile): * lisp/net/tramp-integration.el (tramp-connection-local-default-profile): Revert patch from 2019-05-24. It is fixed differently. * lisp/net/tramp.el (tramp-encoding-shell): (tramp-encoding-command-switch) (tramp-encoding-command-interactive, ) (tramp-unquote-shell-quote-argument): Suppress `shell-file-name'. (tramp-set-file-uid-gid): * lisp/net/tramp-sh.el (tramp-find-inline-compress) (tramp-make-copy-program-file-name): * lisp/net/tramp-smb.el (tramp-smb-handle-copy-directory): Use `tramp-unquote-shell-quote-argument'.
Diffstat (limited to 'lisp/net/tramp-integration.el')
-rw-r--r--lisp/net/tramp-integration.el7
1 files changed, 2 insertions, 5 deletions
diff --git a/lisp/net/tramp-integration.el b/lisp/net/tramp-integration.el
index 6e3b0279ec8..35d2eb38e60 100644
--- a/lisp/net/tramp-integration.el
+++ b/lisp/net/tramp-integration.el
@@ -174,11 +174,8 @@ NAME must be equal to `tramp-current-connection'."
;;; Default connection-local variables for Tramp:
(defconst tramp-connection-local-default-profile
- ;; `w32-shell-name' is derived from `shell-file-name'. Don't let it
- ;; be confused.
- (unless (eq system-type 'windows-nt)
- '((shell-file-name . "/bin/sh")
- (shell-command-switch . "-c")))
+ '((shell-file-name . "/bin/sh")
+ (shell-command-switch . "-c"))
"Default connection-local variables for remote connections.")
;; `connection-local-set-profile-variables' and