From c08c266bfddc8be4364d56c10dc5c68ca6dc1a84 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Fri, 29 Jan 2016 07:04:03 -0500 Subject: [PATCH] elisp: properly highlight narf macros --- modules/module-lisp.el | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/modules/module-lisp.el b/modules/module-lisp.el index 4713802ab..edf1c734e 100644 --- a/modules/module-lisp.el +++ b/modules/module-lisp.el @@ -47,10 +47,20 @@ collect (cons disp (cons k v))))) -(font-lock-add-keywords 'emacs-lisp-mode `(("(\\(lambda\\)" (0 (narf/show-as ?λ))))) -;; Highlight narf macros (macros are already fontified in emacs 25+) -(when (<= emacs-major-version 24) - (font-lock-add-keywords 'emacs-lisp-mode `(("(\\([^!]+!\\) " 1 'font-lock-keyword-face)))) +(font-lock-add-keywords + 'emacs-lisp-mode + `(("(\\(lambda\\)" + (1 (narf/show-as ?λ))) + ;; Highlight narf macros (macros are fontified in emacs 25+) + (,(concat + "(\\(" + (regexp-opt '("λ" "in" "map" "after" "exmap" "shut-up" + "add-hook" "associate" "open-with" "define-repl" + "define-builder" "narf-space-setup" "define-env-command" + "define-text-object" "add-yas-minor-mode" + "define-company-backend")) + "!\\)") + (1 font-lock-keyword-face append)))) ;; Real go-to-definition for elisp (map! :map emacs-lisp-mode-map