diff options
Diffstat (limited to 'lisp/progmodes/eglot.el')
| -rw-r--r-- | lisp/progmodes/eglot.el | 7 |
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 |