From: Augusto Stoffel <arstoffel@gmail.com>
Date: Sat, 22 May 2021 10:53:38 +0000 (+0200)
Subject: Allow staying out of flymake-mode, eldoc-mode
X-Git-Tag: emacs-29.0.90~1616^2~524^2~4^2~135
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=210b52859e71b81c6dc022ea3e07b1a68bc978d3;p=emacs.git

Allow staying out of flymake-mode, eldoc-mode

* eglot.el (eglot--managed-mode): don't enable flymake or eldoc when
those symbols belong to eglot-stay-out-of.

GitHub-reference: fix https://github.com/joaotavora/eglot/issues/671
---

diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el
index db468d83c14..13d9952494a 100644
--- a/lisp/progmodes/eglot.el
+++ b/lisp/progmodes/eglot.el
@@ -1500,8 +1500,8 @@ Use `eglot-managed-p' to determine if current buffer is managed.")
     (unless (eglot--stay-out-of-p 'imenu)
       (add-function :before-until (local 'imenu-create-index-function)
                     #'eglot-imenu))
-    (flymake-mode 1)
-    (eldoc-mode 1)
+    (unless (eglot--stay-out-of-p 'flymake) (flymake-mode 1))
+    (unless (eglot--stay-out-of-p 'eldoc) (eldoc-mode 1))
     (cl-pushnew (current-buffer) (eglot--managed-buffers (eglot-current-server))))
    (t
     (remove-hook 'after-change-functions 'eglot--after-change t)