@@ -183,6 +183,14 @@

     `((t :foreground ,zenburn-blue :inherit magit-keyword))

     "Face for parts of commit messages inside brackets."

     :group 'magit-faces)

+  (defface magit-keyword-test

+    `((t :foreground ,zenburn-blue-1 :inherit magit-keyword))

+    "Face for parts of commit messages inside brackets."

+    :group 'magit-faces)

+  (defface magit-keyword-refactor

+    `((t :foreground ,zenburn-green+1 :inherit magit-keyword))

+    "Face for parts of commit messages inside brackets."

+    :group 'magit-faces)

   (defface magit-keyword-misc

     `((t :foreground ,zenburn-fg-1 :inherit magit-keyword))

     "Face for parts of commit messages inside brackets."

@@ -192,22 +200,23 @@

     "Face for parts of commit messages inside brackets."

     :group 'magit-faces))

+(defvar fwoar::*magit-log-regexp-faces*

+  '((magit-keyword-feature

+     "^\\(\\(?:feat\\(?:ure\\)?(\\([^)]+?\\))\\)\\|\\(?:feat\\(ure\\)?\\>\\)\\)")

+    (magit-keyword-chore "^\\(\\(?:chore(\\([^)]+?\\))\\)\\|\\(?:chore\\>\\)\\)")

+    (magit-keyword-test "^\\(\\(?:test(\\([^)]+?\\))\\)\\|\\(?:test\\>\\)\\)")

+    (magit-keyword-refactor "^\\(\\(?:refactor(\\([^)]+?\\))\\)\\|\\(?:refactor\\>\\)\\)")

+    (magit-keyword-bug "^\\(\\(?:bug(\\([^)]+?\\))\\)\\|\\(?:bug\\>\\)\\)")

+    (magit-keyword-test "^\\(\\(?:test(\\([^)]+?\\))\\)\\|\\(?:test\\>\\)\\)")

+    ))

+

 (defun fwoar/propertize-magit-log (_rev msg)

-  (let ((boundary 0))

-    (while (string-match "^\\(\\(?:feat\\(?:ure\\)?(\\([^)]+?\\))\\)\\|\\(?:feat\\(ure\\)?\\>\\)\\)" msg boundary)

-      (setq boundary (match-end 0))

-      (magit--put-face (match-beginning 0) boundary

-                       'magit-keyword-feature msg)))

-  (let ((boundary 0))

-    (while (string-match "^\\(\\(?:chore(\\([^)]+?\\))\\)\\|\\(?:chore\\>\\)\\)" msg boundary)

-      (setq boundary (match-end 0))

-      (magit--put-face (match-beginning 0) boundary

-                       'magit-keyword-chore msg)))

-  (let ((boundary 0))

-    (while (string-match "^\\(\\(?:bug(\\([^)]+?\\))\\)\\|\\(?:bug\\>\\)\\)"  msg boundary)

-      (setq boundary (match-end 0))

-      (magit--put-face (match-beginning 0) boundary

-                       'magit-keyword-bug msg)))

+  (cl-loop for (face regexp) in fwoar::*magit-log-regexp-faces*

+           do (let ((boundary 0))

+                (while (string-match regexp msg boundary)

+                  (setq boundary (match-end 0))

+                  (magit--put-face (match-beginning 0) boundary face msg))))

+

   (let ((boundary 0))

     (while (string-match "^\\([^:\n\t]+\\):"  msg boundary)

       (setq boundary (match-end 0))