emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

emacs-29 40c9fc8e3b3: Eglot: work around Tramp instability bug#61350


From: João Távora
Subject: emacs-29 40c9fc8e3b3: Eglot: work around Tramp instability bug#61350
Date: Wed, 1 Mar 2023 06:11:56 -0500 (EST)

branch: emacs-29
commit 40c9fc8e3b3f55c9122b95e21660b5709109bd1a
Author: João Távora <joaotavora@gmail.com>
Commit: João Távora <joaotavora@gmail.com>

    Eglot: work around Tramp instability bug#61350
    
    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.
---
 lisp/progmodes/eglot.el | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el
index 40fc8f8a12f..119b4f64c8d 100644
--- a/lisp/progmodes/eglot.el
+++ b/lisp/progmodes/eglot.el
@@ -130,7 +130,8 @@
 (defvar markdown-fontify-code-blocks-natively)
 (defvar company-backends)
 (defvar company-tooltip-align-annotations)
-
+(defvar tramp-ssh-controlmaster-options)
+(defvar tramp-use-ssh-controlmaster-options)
 
 
 ;;; User tweakable stuff
@@ -1249,7 +1250,15 @@ This docstring appeases checkdoc, that's all."
                         (contact (cl-subseq contact 0 probe)))
                    `(:process
                      ,(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
                            :name readable-name
                            :command (setq server-info (eglot--cmd contact))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]