summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Albinus <michael.albinus@gmx.de>2022-02-25 10:11:40 +0100
committerMichael Albinus <michael.albinus@gmx.de>2022-02-25 10:11:40 +0100
commitded89ed3fa93c17a03051c6a6f77335c58af2d21 (patch)
tree8b76c8416d93ea0700c773197b64a6d91319d57a
parent5c77aed2d627eba140729824cc41c91905aac52d (diff)
downloademacs-ded89ed3fa93c17a03051c6a6f77335c58af2d21.tar.gz
* lisp/net/tramp-sh.el (tramp-ssh-controlmaster-options): Adapt test.
-rw-r--r--lisp/net/tramp-sh.el2
1 files changed, 1 insertions, 1 deletions
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))