2 files changed, 20 insertions, 3 deletions

@@ -45,9 +45,7 @@
            ;; "C-x C-3" #'+split-window-right-then
            )
   ;; Font-lock keywords
-  (font-lock-add-keywords
-   nil
-   '(("\\<\\(TODO\\|XXX\\|FIXME\\|BUG\\):" 1 font-lock-warning-face t)))
+  (add-hook 'prog-mode-hook #'font-lock-todo-insinuate)
   ;; C-h deletes backward - see https://idiomdrottning.org/bad-emacs-defaults
   (global-set-key (kbd "C-h") 'delete-backward-char)
   (keyboard-translate ?\C-h ?\C-?)
@@ -222,5 +222,24 @@ UNIT can be one of :kb, :mb, :gb, :tb, :pb, :eb, :zb, :yb; :kib, :mib, :gib,
               (:zib (* 1024 1024 1024 1024 1024 1024 1024))
               (:yib (* 1024 1024 1024 1024 1024 1024 1024 1024)))))
 
+;;; Font lock TODO keywords
+
+(defcustom font-lock-todo-keywords '("TODO" "XXX" "FIXME" "BUG")
+  "Keywords to highlight with `font-lock-todo-face'.")
+
+(defface font-lock-todo-face '((t :inherit font-lock-warning-face))
+  "Face for TODO keywords.")
+
+(defun font-lock-todo-insinuate ()
+  (let ((keyword-regexp
+         (rx bow (group (eval (let ((lst '(or)))
+                                (dolist (kw font-lock-todo-keywords)
+                                  (push kw lst))
+                                (nreverse lst))))
+             ":")))
+    (font-lock-add-keywords
+     nil
+     `((,keyword-regexp 1 'font-lock-todo-face prepend)))))
+
 (provide 'acdw)
 ;;; acdw.el ends here