diff options
author | Michael Albinus <michael.albinus@gmx.de> | 2022-05-29 13:31:32 +0200 |
---|---|---|
committer | Michael Albinus <michael.albinus@gmx.de> | 2022-05-29 13:31:32 +0200 |
commit | 1b7b69e764370288583aeeda38069a3c8f9ec912 (patch) | |
tree | 098171a03f8aef13b9a7bc8265f8339a108d5e01 /lisp/net | |
parent | f9ee83bfb9f09a32ca8c15385f0cd3ec12ebde8c (diff) | |
download | emacs-1b7b69e764370288583aeeda38069a3c8f9ec912.tar.gz emacs-1b7b69e764370288583aeeda38069a3c8f9ec912.tar.bz2 emacs-1b7b69e764370288583aeeda38069a3c8f9ec912.zip |
Some Tramp cleanup on MS Windows
* lisp/net/tramp.el (tramp-restricted-shell-hosts-alist): Do not add
localhost when `tramp-encoding-shell' is a POSIX shell.
* test/lisp/net/tramp-tests.el (tramp-test31-interrupt-process):
Skip on MS Windows.
Diffstat (limited to 'lisp/net')
-rw-r--r-- | lisp/net/tramp.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 63ea8a283c6..3ee11691395 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -497,7 +497,8 @@ interpreted as a regular expression which always matches." ;; either lower case or upper case letters. See ;; <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=38079#20>. (defcustom tramp-restricted-shell-hosts-alist - (when (eq system-type 'windows-nt) + (when (and (eq system-type 'windows-nt) + (not (string-match-p "sh$" tramp-encoding-shell))) (list (format "\\`\\(%s\\|%s\\)\\'" (regexp-quote (downcase tramp-system-name)) (regexp-quote (upcase tramp-system-name))))) |