procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix 'flymake-show-diagnostics-buffer' when line numbers are displayed

Browse source 
* lisp/progmodes/flymake.el (flymake--diagnostics-buffer-entries):
Do nothing if 'flymake--diagnostics-buffer-source' is not a
buffer.  (Bug#40529)
This commit is contained in:
Eli Zaretskii 2020-04-13 08:00:14 +03:00
parent 63e8d0ea87
commit ff09b4eeac
1 changed files with 36 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lisp/progmodes/flymake.el
View file

@ -1321,6 +1321,13 @@ POS can be a buffer position or a button"
(flymake-show-diagnostic (if (button-type pos) (button-start pos) pos)))) (flymake-show-diagnostic (if (button-type pos) (button-start pos) pos))))
(defun flymake--diagnostics-buffer-entries () (defun flymake--diagnostics-buffer-entries ()
;; Do nothing if 'flymake--diagnostics-buffer-source' has not yet
;; been set to a valid buffer. This could happen when this function
;; is called too early. For example 'global-display-line-numbers-mode'
;; calls us from its mode hook, when the diagnostic buffer has just
;; been created by 'flymake-show-diagnostics-buffer', but is not yet
;; set up properly.
(when (bufferp flymake--diagnostics-buffer-source)
(with-current-buffer flymake--diagnostics-buffer-source (with-current-buffer flymake--diagnostics-buffer-source
(cl-loop for diag in (cl-loop for diag in
(cl-sort (flymake-diagnostics) #'< :key #'flymake-diagnostic-beg) (cl-sort (flymake-diagnostics) #'< :key #'flymake-diagnostic-beg)
@ -1349,7 +1356,7 @@ POS can be a buffer position or a button"
help-echo "mouse-2: visit this diagnostic" help-echo "mouse-2: visit this diagnostic"
face nil face nil
action flymake-goto-diagnostic action flymake-goto-diagnostic
mouse-action flymake-goto-diagnostic)])))) mouse-action flymake-goto-diagnostic)])))))
(define-derived-mode flymake-diagnostics-buffer-mode tabulated-list-mode (define-derived-mode flymake-diagnostics-buffer-mode tabulated-list-mode
"Flymake diagnostics" "Flymake diagnostics"