From b9d0995b1763ede28420af0f5dd2f7af32ebf582 Mon Sep 17 00:00:00 2001 From: not manx Date: Wed, 29 Jul 2020 19:24:12 +0100 Subject: [PATCH] Cleaner regex --- package.use-mode.el | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/package.use-mode.el b/package.use-mode.el index d805cb8..cf65428 100644 --- a/package.use-mode.el +++ b/package.use-mode.el @@ -29,7 +29,6 @@ ;; Thanks to nginx-mode where I stole most of this. ;;; Code: - (defvar package.use-mode-syntax-table (let ((table (make-syntax-table))) (modify-syntax-entry ?# "< b" table) @@ -40,11 +39,15 @@ (defvar package.use--version-bit (rx line-start (? (or "=" ">" "<" ">=" "<=")))) +(defconst package.use--characters + `(1+ (any alnum "_" "." "+" "*" "-")) + "The characters allowed in a package.use catagory or name bit.") + (defvar package.use--catagory-bit - (rx (1+ (any alnum "_" "." "+" "*" "-")) "/")) + (rx (eval package.use--characters) "/")) (defvar package.use--name-bit - (rx (group (1+ (any alnum "_" "." "+" "*" "-"))))) + (rx (group (eval package.use--characters)))) (defvar package.use-font-lock-keywords (list