emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

emacs-28 ded89ed3fa: * lisp/net/tramp-sh.el (tramp-ssh-controlmaster-opt


From: Michael Albinus
Subject: emacs-28 ded89ed3fa: * lisp/net/tramp-sh.el (tramp-ssh-controlmaster-options): Adapt test.
Date: Fri, 25 Feb 2022 04:11:49 -0500 (EST)

branch: emacs-28
commit ded89ed3fa93c17a03051c6a6f77335c58af2d21
Author: Michael Albinus <michael.albinus@gmx.de>
Commit: Michael Albinus <michael.albinus@gmx.de>

    * lisp/net/tramp-sh.el (tramp-ssh-controlmaster-options): Adapt test.
---
 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 b3694a6a8d..80fd99e7f6 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))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]