From: Michael Albinus <michael.albinus@gmx.de>
Date: Fri, 24 May 2019 13:36:02 +0000 (+0200)
Subject: Fix Bug#35769
X-Git-Tag: emacs-27.0.90~2804
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=adab8bd35be440900ac6e4a250665bca2f9c7d51;p=emacs.git

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)
---

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