diff options
| author | Michael Albinus | 2022-02-25 10:11:40 +0100 |
|---|---|---|
| committer | Michael Albinus | 2022-02-25 10:11:40 +0100 |
| commit | ded89ed3fa93c17a03051c6a6f77335c58af2d21 (patch) | |
| tree | 8b76c8416d93ea0700c773197b64a6d91319d57a | |
| parent | 5c77aed2d627eba140729824cc41c91905aac52d (diff) | |
| download | emacs-ded89ed3fa93c17a03051c6a6f77335c58af2d21.tar.gz emacs-ded89ed3fa93c17a03051c6a6f77335c58af2d21.zip | |
* lisp/net/tramp-sh.el (tramp-ssh-controlmaster-options): Adapt test.
| -rw-r--r-- | lisp/net/tramp-sh.el | 2 |
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'." | |||
| 4759 | (with-temp-buffer | 4759 | (with-temp-buffer |
| 4760 | (tramp-call-process vec "ssh" nil t nil "-o" "ControlMaster") | 4760 | (tramp-call-process vec "ssh" nil t nil "-o" "ControlMaster") |
| 4761 | (goto-char (point-min)) | 4761 | (goto-char (point-min)) |
| 4762 | (when (search-forward-regexp "missing.+argument" nil t) | 4762 | (when (search-forward-regexp "\\(missing\\|no\\).+argument" nil t) |
| 4763 | (setq tramp-ssh-controlmaster-options | 4763 | (setq tramp-ssh-controlmaster-options |
| 4764 | "-o ControlMaster=auto"))) | 4764 | "-o ControlMaster=auto"))) |
| 4765 | (unless (zerop (length tramp-ssh-controlmaster-options)) | 4765 | (unless (zerop (length tramp-ssh-controlmaster-options)) |