From 7bb5dc7cfa7ff3d553369270f7cc6cd9868c69e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20T=C3=A1vora?= Date: Wed, 15 Mar 2023 19:52:34 +0000 Subject: [PATCH 4/4] Just for testing: Remove Tramp-specific workaround in Eglot * lisp/progmodes/eglot.el (eglot--connect): No longer bind tramp vars. (tramp-ssh-controlmaster-options) (tramp-use-ssh-controlmaster-options): Remove. --- lisp/progmodes/eglot.el | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el index 6c1b9eafe43..f96f7dd254f 100644 --- a/lisp/progmodes/eglot.el +++ b/lisp/progmodes/eglot.el @@ -130,8 +130,6 @@ (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 @@ -1251,15 +1249,7 @@ eglot--connect (contact (cl-subseq contact 0 probe))) `(:process ,(lambda () - (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")) + (let ((default-directory default-directory)) (make-process :name readable-name :command (setq server-info (eglot--cmd contact)) -- 2.39.2