From: João Távora <joaotavora@gmail.com>
Date: Sat, 2 Nov 2019 16:16:14 +0000 (+0000)
Subject: Avoid face clashes between Flymake and region highlighting
X-Git-Tag: emacs-27.0.90~761
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=455e753a2b8fa2e83d23be1771f3371ba90b85f9;p=emacs.git

Avoid face clashes between Flymake and region highlighting

Fix bug#34022.

* lisp/progmodes/flymake.el (flymake--highlight-line): Use
(PRIMARY . SECONDARY) priority value.
---

diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index 474c6335874..e394096e23e 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -652,7 +652,9 @@ associated `flymake-category' return DEFAULT."
              (flymake-diagnostics pos)
              "\n"))))
       (default-maybe 'severity (warning-numeric-level :error))
-      (default-maybe 'priority (+ 100 (overlay-get ov 'severity))))
+      ;; Use (PRIMARY . SECONDARY) priority, to avoid clashing with
+      ;; `region' face, for example (bug#34022).
+      (default-maybe 'priority (cons nil (+ 40 (overlay-get ov 'severity)))))
     ;; Some properties can't be overridden.
     ;;
     (overlay-put ov 'evaporate t)