mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-14 18:10:32 -08:00
Code Issues Projects Releases Wiki Activity

Some Tramp cleanup on MS Windows

Browse source 
* 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.
This commit is contained in:
Michael Albinus 2022-05-29 13:31:32 +02:00
parent f9ee83bfb9
commit 1b7b69e764
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lisp/net/tramp.el
View file

@ -497,7 +497,8 @@ interpreted as a regular expression which always matches."
;; either lower case or upper case letters. See ;; either lower case or upper case letters. See
;; <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=38079#20>. ;; <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=38079#20>.
(defcustom tramp-restricted-shell-hosts-alist (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\\)\\'" (list (format "\\`\\(%s\\|%s\\)\\'"
(regexp-quote (downcase tramp-system-name)) (regexp-quote (downcase tramp-system-name))
(regexp-quote (upcase tramp-system-name))))) (regexp-quote (upcase tramp-system-name)))))

1
test/lisp/net/tramp-tests.el
View file

@ -5019,6 +5019,7 @@ If UNSTABLE is non-nil, the test is tagged as `:unstable'."
'(:unstable))) '(:unstable)))
(skip-unless (tramp--test-enabled)) (skip-unless (tramp--test-enabled))
(skip-unless (tramp--test-sh-p)) (skip-unless (tramp--test-sh-p))
(skip-unless (not (tramp--test-windows-nt-p)))
(skip-unless (not (tramp--test-crypt-p))) (skip-unless (not (tramp--test-crypt-p)))
;; Since Emacs 26.1. ;; Since Emacs 26.1.
(skip-unless (boundp 'interrupt-process-functions)) (skip-unless (boundp 'interrupt-process-functions))