procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Eglot: work around Tramp instability bug#61350

Browse source 
Unconditionally disable ControlMaster for the Eglot's Tramp
connection.

* lisp/progmodes/eglot.el (tramp-ssh-controlmaster-options)
(use-tramp-ssh-controlmaster-options): Forward declare
(eglot--connect): Set variables to unconditionally disable ControlMaster.
This commit is contained in:
João Távora 2023-03-01 11:12:51 +00:00
parent 4a6db125b9
commit 40c9fc8e3b
1 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

13
lisp/progmodes/eglot.el
View file

@ -130,7 +130,8 @@
(defvar markdown-fontify-code-blocks-natively) (defvar markdown-fontify-code-blocks-natively)
(defvar company-backends) (defvar company-backends)
(defvar company-tooltip-align-annotations) (defvar company-tooltip-align-annotations)
(defvar tramp-ssh-controlmaster-options)
(defvar tramp-use-ssh-controlmaster-options)
;;; User tweakable stuff ;;; User tweakable stuff
@ -1249,7 +1250,15 @@ This docstring appeases checkdoc, that's all."
(contact (cl-subseq contact 0 probe))) (contact (cl-subseq contact 0 probe)))
`(:process `(:process
,(lambda () ,(lambda ()
(let ((default-directory default-directory)) (let ((default-directory default-directory)
;; bug#61350: Tramp turns on a feature
;; by default that can't (yet) handle
;; very much data so we turn it off
;; unconditionally -- just for our
;; process.
(tramp-use-ssh-controlmaster-options t)
(tramp-ssh-controlmaster-options
"-o ControlMaster=no -o ControlPath=none"))
(make-process (make-process
:name readable-name :name readable-name
:command (setq server-info (eglot--cmd contact)) :command (setq server-info (eglot--cmd contact))