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 008a5cedd8b34aa83d9cd3ba554eb14db9450881..9a214c369a681297a101395242b8badd93734fc8 100644 (file)
--- 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 35d2eb38e6085c91dd414f06eb2a4749ada94d1b..6e3b0279ec849bd1a0b1608759523e4eff430ce0 100644 (file)
--- 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