master 8fef9a5cd9 3/3: Merge remote-tracking branch 'origin/master'

[Po Lu]

branch: master
commit 8fef9a5cd9a16b2f91f2ad4e7edbcc49c3963d42
Merge: f7b5553045 dfd76688be
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>

    Merge remote-tracking branch 'origin/master'
---
 test/lisp/net/tramp-tests.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index 2ce7881543..4e74f2aa73 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -6533,8 +6533,8 @@ This requires restrictions of file name syntax."
                           ;; processes in Emacs.  That doesn't work
                           ;; for tramp-adb.el.  tramp-sshfs.el times
                           ;; out for older Emacsen, reason unknown.
-                          (or (not (tramp--test-adb-p))
-                              (not (tramp--test-sshfs-p))
+                          (or (and (not (tramp--test-adb-p))
+                                   (not (tramp--test-sshfs-p)))
                               (tramp--test-emacs27-p)))
                  (let ((default-directory file1))
                    (dolist (this-shell-command