[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master adab8bd 1/2: Fix Bug#35769
From: |
Michael Albinus |
Subject: |
[Emacs-diffs] master adab8bd 1/2: Fix Bug#35769 |
Date: |
Fri, 24 May 2019 09:36:30 -0400 (EDT) |
branch: master
commit adab8bd35be440900ac6e4a250665bca2f9c7d51
Author: Michael Albinus <address@hidden>
Commit: Michael Albinus <address@hidden>
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 008a5ce..9a214c3 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 35d2eb3..6e3b027 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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master adab8bd 1/2: Fix Bug#35769,
Michael Albinus <=