From d5e7dcc8307aba2bab2b61cb10dd6aacd5c8607d Mon Sep 17 00:00:00 2001 From: Eshel Yaron Date: Tue, 22 Apr 2025 19:56:09 +0200 Subject: [PATCH] Fix Flymake breakage following recent changes --- lisp/progmodes/eglot.el | 4 ---- lisp/progmodes/flymake.el | 6 +++--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el index a6aea329f59..d8569ff0df2 100644 --- a/lisp/progmodes/eglot.el +++ b/lisp/progmodes/eglot.el @@ -2091,10 +2091,6 @@ and just return it. PROMPT shouldn't end with a question mark." ;;; Minor modes ;;; -(defvar eglot-mode-map - (let ((map (make-sparse-keymap))) - (define-key map [remap display-local-help] #'eldoc-doc-buffer) - map)) (defvar-local eglot--current-flymake-report-fn nil "Current flymake report function for this buffer.") diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el index 539a1a29508..44f923d74a1 100644 --- a/lisp/progmodes/flymake.el +++ b/lisp/progmodes/flymake.el @@ -380,9 +380,9 @@ diagnostics at BEG." (flymake--diag-accessor flymake-diagnostic-buffer flymake--diag-locus locus) (defcustom flymake-diagnostic-format-alist - '((:help-echo origin code oneliner) + '((:help-echo oneliner) (:eol oneliner) - (t origin code oneliner)) + (t oneliner)) "How to format diagnostics for different output destinations. Value is an alist where each element looks like (DESTINATION . PARTS). DESTINATION is a symbol designating an outlet. One of: @@ -892,7 +892,7 @@ that project instead." (dolist (d (if project (flymake--project-diagnostics project) (flymake-diagnostics))) - (let ((cand (propertize (format "%-4d:%s" (cl-incf ind) (flymake--diag-text d)) + (let ((cand (propertize (format "%-4d:%s" (cl-incf ind) (flymake--diag-message d)) 'diagnostic d))) (push cand cands) (puthash ind d tab))) -- 2.39.5