:mode and :interpreter can now accept (rx ...) forms

Fixes https://github.com/jwiegley/use-package/issues/204

diff --git a/lisp/use-package/use-package.el b/lisp/use-package/use-package.el
index 733a6316647030cb8b144a4512b8f32d03d70a1e..c6387d7e1f1f75411e239861f3b0a1a4c57390dc 100644 (file)
--- a/lisp/use-package/use-package.el
+++ b/lisp/use-package/use-package.el
@@ -427,6 +427,28 @@ This is in contrast to merely setting it to 0."
 ;;; Normalization functions
 ;;
 
+(defun use-package-regex-p (re)
+  "Return t if RE is some regexp-like thing."
+  (cond
+   ((and (listp re)
+         (eq (car re) 'rx))
+    t)
+   ((stringp re)
+    t)
+   (t
+    nil)))
+
+(defun use-package-normalize-regex (re)
+  "Given some regexp-like thing, resolve it down to a regular expression."
+  (cond
+   ((and (listp re)
+         (eq (car re) 'rx))
+    (eval re))
+   ((stringp re)
+    re)
+   (t
+    (error "Not recognized as regular expression: %s" re))))
+
 (defun use-package-normalize-plist (name input)
   "Given a pseudo-plist, normalize it to a regular plist."
   (unless (null input)
@@ -877,7 +899,8 @@ deferred until the prefix key sequence is pressed."
 (defun use-package-normalize-mode (name keyword args)
   (use-package-as-one (symbol-name keyword) args
     (apply-partially #'use-package-normalize-pairs
-                     #'stringp (lambda (m) (and (not (null m)) (symbolp m)))
+                     #'use-package-regex-p
+                     (lambda (m) (and (not (null m)) (symbolp m)))
                      name)))
 
 (defalias 'use-package-normalize/:interpreter 'use-package-normalize-mode)
@@ -886,6 +909,8 @@ deferred until the prefix key sequence is pressed."
   (let* (commands
          (form (mapcar #'(lambda (interpreter)
                            (push (cdr interpreter) commands)
+                           (setcar interpreter
+                                   (use-package-normalize-regex (car interpreter)))
                            `(add-to-list 'interpreter-mode-alist ',interpreter)) arg)))
     (use-package-concat
      (use-package-process-keywords name
@@ -905,6 +930,8 @@ deferred until the prefix key sequence is pressed."
   (let* (commands
          (form (mapcar #'(lambda (mode)
                            (push (cdr mode) commands)
+                           (setcar mode
+                                   (use-package-normalize-regex (car mode)))
                            `(add-to-list 'auto-mode-alist ',mode)) arg)))
     (use-package-concat
      (use-package-process-keywords name