Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 17:24:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge from origin/emacs-28

Browse source 
1b7b69e764 Some Tramp cleanup on MS Windows
This commit is contained in:
Stefan Kangas 2022-05-30 06:30:24 +02:00
commit 52d41f2750
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lisp/net/tramp.el
View file

@ -505,7 +505,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)))))

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

@ -5092,6 +5092,7 @@ If UNSTABLE is non-nil, the test is tagged as `:unstable'."
:tags '(:expensive-test :tramp-asynchronous-processes :unstable)
(skip-unless (tramp--test-enabled))
(skip-unless (tramp--test-sh-p))
(skip-unless (not (tramp--test-windows-nt-p)))
(skip-unless (not (tramp--test-crypt-p)))
;; Since Emacs 27.1.
(skip-unless (macrop 'with-connection-local-variables))