From adab8bd35be440900ac6e4a250665bca2f9c7d51 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Fri, 24 May 2019 15:36:02 +0200 Subject: [PATCH] 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) --- lisp/net/tramp-adb.el | 7 +++++-- lisp/net/tramp-integration.el | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/lisp/net/tramp-adb.el b/lisp/net/tramp-adb.el index 008a5cedd8b..9a214c369a6 100644 --- a/lisp/net/tramp-adb.el +++ b/lisp/net/tramp-adb.el @@ -1294,8 +1294,11 @@ connection if a previous connection has died for some reason." ;; Default settings for connection-local variables. (defconst tramp-adb-connection-local-default-profile - '((shell-file-name . "/system/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 . "/system/bin/sh") + (shell-command-switch . "-c"))) "Default connection-local variables for remote adb connections.") ;; `connection-local-set-profile-variables' and 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 -- 2.39.2