master c215158756: Merge from origin/emacs-28

[Stefan Kangas]

branch: master
commit c215158756b127f77a1cf298e80529e2589a23b4
Merge: 63a21224a5 ded89ed3fa
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>

    Merge from origin/emacs-28
    
    ded89ed3fa * lisp/net/tramp-sh.el (tramp-ssh-controlmaster-options): ...
---
 lisp/net/tramp-sh.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 3c28463515..c7ebb4d81b 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -4789,7 +4789,7 @@ Goes through the list `tramp-inline-compress-commands'."
              (with-temp-buffer
                (tramp-call-process vec "ssh" nil t nil "-o" "ControlMaster")
                (goto-char (point-min))
-               (when (search-forward-regexp "missing.+argument" nil t)
+               (when (search-forward-regexp "\\(missing\\|no\\).+argument" nil 
t)
                  (setq tramp-ssh-controlmaster-options
                        "-o ControlMaster=auto")))
              (unless (zerop (length tramp-ssh-controlmaster-options))