diff options
| author | João Távora | 2019-11-02 16:16:14 +0000 |
|---|---|---|
| committer | João Távora | 2019-11-02 16:16:14 +0000 |
| commit | 455e753a2b8fa2e83d23be1771f3371ba90b85f9 (patch) | |
| tree | 769d9ad4434d19623fe75ca1038a3fc8ca0e6042 | |
| parent | b32c4d7bac8e0b3642d8ad90ee40a44466e29aad (diff) | |
| download | emacs-455e753a2b8fa2e83d23be1771f3371ba90b85f9.tar.gz emacs-455e753a2b8fa2e83d23be1771f3371ba90b85f9.zip | |
Avoid face clashes between Flymake and region highlighting
Fix bug#34022.
* lisp/progmodes/flymake.el (flymake--highlight-line): Use
(PRIMARY . SECONDARY) priority value.
| -rw-r--r-- | lisp/progmodes/flymake.el | 4 |
1 files changed, 3 insertions, 1 deletions
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." | |||
| 652 | (flymake-diagnostics pos) | 652 | (flymake-diagnostics pos) |
| 653 | "\n")))) | 653 | "\n")))) |
| 654 | (default-maybe 'severity (warning-numeric-level :error)) | 654 | (default-maybe 'severity (warning-numeric-level :error)) |
| 655 | (default-maybe 'priority (+ 100 (overlay-get ov 'severity)))) | 655 | ;; Use (PRIMARY . SECONDARY) priority, to avoid clashing with |
| 656 | ;; `region' face, for example (bug#34022). | ||
| 657 | (default-maybe 'priority (cons nil (+ 40 (overlay-get ov 'severity))))) | ||
| 656 | ;; Some properties can't be overridden. | 658 | ;; Some properties can't be overridden. |
| 657 | ;; | 659 | ;; |
| 658 | (overlay-put ov 'evaporate t) | 660 | (overlay-put ov 'evaporate t) |