tag: 1.2
commit b573d42d038b5c83df75dbb8cdf7acf0b1299a55
Author: João Távora <[email protected]>
Commit: João Távora <[email protected]>
Close #44: Don't turn on flymake-mode any more than is needed
If flymake-mode is in eglot--managed-mode-hook, it will be called even
if eglot--managed-mode is being turned off, which could be problematic
because it triggers a check if flymake-start-on-flymake-mode is t.
* eglot.el (eglot--managed-mode): Turn on flymake-mode and
eldoc-mode here.
---
eglot.el | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/eglot.el b/eglot.el
index 49a1f3d..cb9a5ed 100644
--- a/eglot.el
+++ b/eglot.el
@@ -700,7 +700,9 @@ If optional MARKERS, make markers."
(add-hook 'change-major-mode-hook 'eglot--managed-mode-onoff nil t)
(add-function :before-until (local 'eldoc-documentation-function)
#'eglot-eldoc-function)
- (add-function :around (local 'imenu-create-index-function) #'eglot-imenu))
+ (add-function :around (local 'imenu-create-index-function) #'eglot-imenu)
+ (flymake-mode 1)
+ (eldoc-mode 1))
(t
(remove-hook 'flymake-diagnostic-functions 'eglot-flymake-backend t)
(remove-hook 'after-change-functions 'eglot--after-change t)
@@ -738,9 +740,6 @@ Reset in `eglot--managed-mode-onoff'.")
(setf (eglot--managed-buffers server)
(delq buf (eglot--managed-buffers server)))))))))
-(add-hook 'eglot--managed-mode-hook 'flymake-mode)
-(add-hook 'eglot--managed-mode-hook 'eldoc-mode)
-
(defun eglot--current-server ()
"Find the current logical EGLOT server."
(or
