masscollaborationlabs/emacs
2
0
Fork 0
mirror of https://github.com/masscollaborationlabs/emacs.git synced 2025-07-05 19:59:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
Fixes https://github.com/jwiegley/use-package/issues/204
This commit is contained in:
John Wiegley 2017-02-16 12:03:59 -08:00
parent 87a8ff6d69
commit f1fa65d773
1 changed files with 28 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

29
lisp/use-package/use-package.el
View file

@ -427,6 +427,28 @@ This is in contrast to merely setting it to 0."
;;; Normalization functions ;;; 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) (defun use-package-normalize-plist (name input)
"Given a pseudo-plist, normalize it to a regular plist." "Given a pseudo-plist, normalize it to a regular plist."
(unless (null input) (unless (null input)
@ -877,7 +899,8 @@ deferred until the prefix key sequence is pressed."
(defun use-package-normalize-mode (name keyword args) (defun use-package-normalize-mode (name keyword args)
(use-package-as-one (symbol-name keyword) args (use-package-as-one (symbol-name keyword) args
(apply-partially #'use-package-normalize-pairs (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))) name)))
(defalias 'use-package-normalize/:interpreter 'use-package-normalize-mode) (defalias 'use-package-normalize/:interpreter 'use-package-normalize-mode)
@ -886,6 +909,8 @@ deferred until the prefix key sequence is pressed."
(let* (commands (let* (commands
(form (mapcar #'(lambda (interpreter) (form (mapcar #'(lambda (interpreter)
(push (cdr interpreter) commands) (push (cdr interpreter) commands)
(setcar interpreter
(use-package-normalize-regex (car interpreter)))
`(add-to-list 'interpreter-mode-alist ',interpreter)) arg))) `(add-to-list 'interpreter-mode-alist ',interpreter)) arg)))
(use-package-concat (use-package-concat
(use-package-process-keywords name (use-package-process-keywords name
@ -905,6 +930,8 @@ deferred until the prefix key sequence is pressed."
(let* (commands (let* (commands
(form (mapcar #'(lambda (mode) (form (mapcar #'(lambda (mode)
(push (cdr mode) commands) (push (cdr mode) commands)
(setcar mode
(use-package-normalize-regex (car mode)))
`(add-to-list 'auto-mode-alist ',mode)) arg))) `(add-to-list 'auto-mode-alist ',mode)) arg)))
(use-package-concat (use-package-concat
(use-package-process-keywords name (use-package-process-keywords name