diff options
author | Michael Albinus <michael.albinus@gmx.de> | 2019-05-24 15:36:02 +0200 |
---|---|---|
committer | Michael Albinus <michael.albinus@gmx.de> | 2019-05-24 15:36:02 +0200 |
commit | adab8bd35be440900ac6e4a250665bca2f9c7d51 (patch) | |
tree | 19cf4685186bb9a8c03fe6a22b789d45268f14db /lisp/net/tramp-integration.el | |
parent | 8cdb9d9d24be0894ec3adc79f7f4af61e131850e (diff) | |
download | emacs-adab8bd35be440900ac6e4a250665bca2f9c7d51.tar.gz |
Fix Bug#35769
* lisp/net/tramp-adb.el (tramp-adb-connection-local-default-profile):
* lisp/net/tramp-integration.el (tramp-connection-local-default-profile):
Do not set it on w32 systems. (Bug#35769)
Diffstat (limited to 'lisp/net/tramp-integration.el')
-rw-r--r-- | lisp/net/tramp-integration.el | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lisp/net/tramp-integration.el b/lisp/net/tramp-integration.el index 35d2eb38e60..6e3b0279ec8 100644 --- a/lisp/net/tramp-integration.el +++ b/lisp/net/tramp-integration.el @@ -174,8 +174,11 @@ NAME must be equal to `tramp-current-connection'." ;;; Default connection-local variables for Tramp: (defconst tramp-connection-local-default-profile - '((shell-file-name . "/bin/sh") - (shell-command-switch . "-c")) + ;; `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"))) "Default connection-local variables for remote connections.") ;; `connection-local-set-profile-variables' and |