[Emacs-diffs] scratch/flymake-refactor 2693054 14/52: Flymake faces are not just for "lines" anymore

[João Távora]

branch: scratch/flymake-refactor
commit 2693054669a0d4f90ec966d473cd997b123c55aa
Author: João Távora <address@hidden>
Commit: João Távora <address@hidden>

    Flymake faces are not just for "lines" anymore
    
    Since diagnostics can highlight arbitrary regions, not just lines, it
    makes sense to rename these faces.
    
    * lisp/progmodes/flymake-ui.el (flymake-error): Rename from
    flymake-errline.
    (flymake-warning): Rename from flymake-warnline.
    (flymake-warnline, flymake-errline): Obsoletion aliases.
    
    * test/lisp/progmodes/flymake-tests.el (warning-predicate-rx-gcc)
    (warning-predicate-function-gcc, warning-predicate-rx-perl)
    (warning-predicate-function-perl): Use face `flymake-warning'.
---
 lisp/progmodes/flymake-ui.el         | 11 +++++++----
 test/lisp/progmodes/flymake-tests.el |  8 ++++----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/lisp/progmodes/flymake-ui.el b/lisp/progmodes/flymake-ui.el
index 4f41f39..50c01ac 100644
--- a/lisp/progmodes/flymake-ui.el
+++ b/lisp/progmodes/flymake-ui.el
@@ -176,24 +176,27 @@ verify FILTER, sort them by COMPARE (using KEY)."
   "Delete all flymake overlays in BUFFER."
   (mapc #'delete-overlay (flymake--overlays)))
 
-(defface flymake-errline
+(defface flymake-error
   '((((supports :underline (:style wave)))
      :underline (:style wave :color "Red1"))
     (t
      :inherit error))
-  "Face used for marking error lines."
+  "Face used for marking error regions."
   :version "24.4"
   :group 'flymake)
 
-(defface flymake-warnline
+(defface flymake-warning
   '((((supports :underline (:style wave)))
      :underline (:style wave :color "DarkOrange"))
     (t
      :inherit warning))
-  "Face used for marking warning lines."
+  "Face used for marking warning regions."
   :version "24.4"
   :group 'flymake)
 
+(define-obsolete-face-alias 'flymake-warnline 'flymake-warning "26.1")
+(define-obsolete-face-alias 'flymake-errline 'flymake-error "26.1")
+
 (defun flymake--diag-region (diagnostic)
   (save-excursion
     (goto-char (point-min))
diff --git a/test/lisp/progmodes/flymake-tests.el 
b/test/lisp/progmodes/flymake-tests.el
index 16c422d..d17f78e 100644
--- a/test/lisp/progmodes/flymake-tests.el
+++ b/test/lisp/progmodes/flymake-tests.el
@@ -67,26 +67,26 @@
 (ert-deftest warning-predicate-rx-gcc ()
   "Test GCC warning via regexp predicate."
   (skip-unless (and (executable-find "gcc") (executable-find "make")))
-  (should (eq 'flymake-warnline
+  (should (eq 'flymake-warning
               (flymake-tests--current-face "test.c" "^[Ww]arning"))))
 
 (ert-deftest warning-predicate-function-gcc ()
   "Test GCC warning via function predicate."
   (skip-unless (and (executable-find "gcc") (executable-find "make")))
-  (should (eq 'flymake-warnline
+  (should (eq 'flymake-warning
               (flymake-tests--current-face "test.c"
                (lambda (msg) (string-match "^[Ww]arning" msg))))))
 
 (ert-deftest warning-predicate-rx-perl ()
   "Test perl warning via regular expression predicate."
   (skip-unless (executable-find "perl"))
-  (should (eq 'flymake-warnline
+  (should (eq 'flymake-warning
               (flymake-tests--current-face "test.pl" "^Scalar value"))))
 
 (ert-deftest warning-predicate-function-perl ()
   "Test perl warning via function predicate."
   (skip-unless (executable-find "perl"))
-  (should (eq 'flymake-warnline
+  (should (eq 'flymake-warning
               (flymake-tests--current-face
                "test.pl"
                (lambda (msg) (string-match "^Scalar value" msg))))))