From: Michael Albinus Date: Fri, 25 Feb 2022 09:11:40 +0000 (+0100) Subject: * lisp/net/tramp-sh.el (tramp-ssh-controlmaster-options): Adapt test. X-Git-Tag: emacs-28.0.92~27 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ded89ed3fa93c17a03051c6a6f77335c58af2d21;p=emacs.git * lisp/net/tramp-sh.el (tramp-ssh-controlmaster-options): Adapt test. --- diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index b3694a6a8d8..80fd99e7f65 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -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))