Fix Flymake breakage following recent changes

diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el
index a6aea329f595cb5bd07d5b8fb8c6f14585db87bc..d8569ff0df2d476c9dca1af61599b89a7252aaee 100644 (file)
--- 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."
 \f
 ;;; 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 539a1a2950857d4e2ae20f521a69330c42fb138c..44f923d74a1255dbb37df668f3dc22b8e299aa8b 100644 (file)
--- 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)))