master 52d41f2750: Merge from origin/emacs-28

[Stefan Kangas]

branch: master
commit 52d41f2750c0f66d7f7ba8e198832734fe750fa5
Merge: 48ef8ab15f 1b7b69e764
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>

    Merge from origin/emacs-28
    
    1b7b69e764 Some Tramp cleanup on MS Windows
---
 lisp/net/tramp.el            | 3 ++-
 test/lisp/net/tramp-tests.el | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index ef1e4206b6..27c6dfde33 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -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)))))
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index 1532cbe049..569e9506d1 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -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))