Don't allow nil as a mode function

This means (use-package foopkg :mode (".foo")) will add (".foo"
. foopkg) into auto-mode-alist instead of the broken (".foo" . nil),
this is more consistent with the behaviour of (use-package foopkg
:mode (".foo" ".bar")).

diff --git a/lisp/use-package/use-package.el b/lisp/use-package/use-package.el
index aeb39b4c3430913d68655d75f45fccb9e173e29d..96137c3c78d75cac30d002bf4d08229ef6497bc6 100644 (file)
--- a/lisp/use-package/use-package.el
+++ b/lisp/use-package/use-package.el
@@ -803,7 +803,7 @@ 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 #'symbolp
+                     #'stringp (lambda (m) (and (not (null m)) (symbolp m)))
                      name)))
 
 (defalias 'use-package-normalize/:interpreter 'use-package-normalize-mode)

diff --git a/test/lisp/use-package/use-package-tests.el b/test/lisp/use-package/use-package-tests.el
index aa9f542a803b2c9ce34647212da20c41550e5a8c..d3deef995b1c57426e04f3b53c639969c8df08c1 100644 (file)
--- a/test/lisp/use-package/use-package-tests.el
+++ b/test/lisp/use-package/use-package-tests.el
@@ -44,6 +44,8 @@
                  '((".foo" . foopkg) (".bar" . foopkg))))
   (should (equal (use-package-normalize-mode 'foopkg :mode '((".foo" ".bar")))
                  '((".foo" . foopkg) (".bar" . foopkg))))
+  (should (equal (use-package-normalize-mode 'foopkg :mode '((".foo")))
+                 '((".foo" . foopkg))))
   (should (equal (use-package-normalize-mode 'foopkg :mode '((".foo" . foo) (".bar" . bar)))
                  '((".foo" . foo) (".bar" . bar)))))