branch: externals/elpa
commit da7ff4883d3108468265fdc16a217d8e6aff92f2
Author: Dan Davison <dandavis...@gmail.com>
Commit: GitHub <nore...@github.com>

    Fix #468: don't call flymake report function if flymake is disabled
    
    Also fix #472.
    
    Copyright-paperwork-exempt: yes
    
    * eglot.el (eglot-handle-notification): Check that flymake-mode is
      active before calling flymake report function.
---
 eglot.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eglot.el b/eglot.el
index 8dae0b7..112959b 100644
--- a/eglot.el
+++ b/eglot.el
@@ -1580,7 +1580,7 @@ COMMAND is a symbol naming the command."
                                              (t          'eglot-note))
                                        message `((eglot-lsp-diag . 
,diag-spec)))))
          into diags
-         finally (cond (eglot--current-flymake-report-fn
+         finally (cond ((and flymake-mode eglot--current-flymake-report-fn)
                         (funcall eglot--current-flymake-report-fn diags
                                  ;; If the buffer hasn't changed since last
                                  ;; call to the report function, flymake won't

Reply via email to