master 455e753: Avoid face clashes between Flymake and region highlighting

[João Távora]

branch: master
commit 455e753a2b8fa2e83d23be1771f3371ba90b85f9
Author: João Távora <address@hidden>
Commit: João Távora <address@hidden>

    Avoid face clashes between Flymake and region highlighting
    
    Fix bug#34022.
    
    * lisp/progmodes/flymake.el (flymake--highlight-line): Use
    (PRIMARY . SECONDARY) priority value.
---
 lisp/progmodes/flymake.el | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index 474c633..e394096 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)