]> git.eshelyaron.com Git - emacs.git/commitdiff
* lisp/net/tramp-sh.el (tramp-ssh-controlmaster-options): Adapt test.
authorMichael Albinus <michael.albinus@gmx.de>
Fri, 25 Feb 2022 09:11:40 +0000 (10:11 +0100)
committerMichael Albinus <michael.albinus@gmx.de>
Fri, 25 Feb 2022 09:11:40 +0000 (10:11 +0100)
lisp/net/tramp-sh.el

index b3694a6a8d8cf34af988a55e39278a44f24e46a4..80fd99e7f65f3bcb56b46b45eb0f5c1984858422 100644 (file)
@@ -4759,7 +4759,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))