summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Albinus <michael.albinus@gmx.de>2023-03-18 13:13:56 +0100
committerMichael Albinus <michael.albinus@gmx.de>2023-03-18 13:13:56 +0100
commit94a21c88647e5142696f3ec731f17c7e94ee64e5 (patch)
treeb37e835e04c7b51fb3f316124de8f674bcbd3708
parent0eddfa28ebdba3b1e5b3249416f14ea67bd41e3c (diff)
downloademacs-94a21c88647e5142696f3ec731f17c7e94ee64e5.tar.gz
* lisp/progmodes/eglot.el (eglot--connect): Improve Tramp workaround.
-rw-r--r--lisp/progmodes/eglot.el7
1 files changed, 6 insertions, 1 deletions
diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el
index 68d07c7178a..00ceca73879 100644
--- a/lisp/progmodes/eglot.el
+++ b/lisp/progmodes/eglot.el
@@ -1258,7 +1258,12 @@ This docstring appeases checkdoc, that's all."
;; very much data so we turn it off
;; unconditionally -- just for our
;; process.
- (tramp-use-ssh-controlmaster-options t)
+ ;; In Tramp 2.6.0.3 and newer, the value
+ ;; `suppress' is sufficient. Older
+ ;; Tramp versions need a non-nil value,
+ ;; and a proper setting of
+ ;; `tramp-ssh-controlmaster-options'.
+ (tramp-use-ssh-controlmaster-options 'suppress)
(tramp-ssh-controlmaster-options
"-o ControlMaster=no -o ControlPath=none"))
(make-process