diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el index ffc9511469f..71271ca0b0a 100644 --- a/lisp/progmodes/eglot.el +++ b/lisp/progmodes/eglot.el @@ -1214,6 +1214,8 @@ eglot--cmd (defvar-local eglot--cached-server nil "A cached reference to the current Eglot server.") +(defvar tramp-use-ssh-controlmaster-options) + (defun eglot--connect (managed-modes project class contact language-id) "Connect to MANAGED-MODES, LANGUAGE-ID, PROJECT, CLASS and CONTACT. This docstring appeases checkdoc, that's all." @@ -1249,7 +1251,9 @@ eglot--connect (contact (cl-subseq contact 0 probe))) `(:process ,(lambda () - (let ((default-directory default-directory)) + (let ((default-directory default-directory) + ;; See bug#61350. + tramp-use-ssh-controlmaster-options) (make-process :name readable-name :command (setq server-info (eglot--cmd contact))