emacs-29 94a21c88647: * lisp/progmodes/eglot.el (eglot--connect): Improve Tramp workaround.

[Michael Albinus]

branch: emacs-29
commit 94a21c88647e5142696f3ec731f17c7e94ee64e5
Author: Michael Albinus <michael.albinus@gmx.de>
Commit: Michael Albinus <michael.albinus@gmx.de>

    * lisp/progmodes/eglot.el (eglot--connect): Improve Tramp workaround.
---
 lisp/progmodes/eglot.el | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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