aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Wiegley2017-12-04 16:46:46 -0800
committerJohn Wiegley2017-12-04 16:46:46 -0800
commitee07e709eadc85479c06db9ca40e6f18bcb41463 (patch)
tree20e12e988855d9acc4eeefa62cdc84112897262b
parentafdf1c363809e721a838f8e7d0b9b791f3138b52 (diff)
downloademacs-ee07e709eadc85479c06db9ca40e6f18bcb41463.tar.gz
emacs-ee07e709eadc85479c06db9ca40e6f18bcb41463.zip
Fix the case where :ensure is given no arguments
Fixes https://github.com/jwiegley/use-package/issues/543
-rw-r--r--lisp/use-package/use-package-ensure.el2
-rw-r--r--test/lisp/use-package/use-package-tests.el8
2 files changed, 9 insertions, 1 deletions
diff --git a/lisp/use-package/use-package-ensure.el b/lisp/use-package/use-package-ensure.el
index 083350edf9e..9cf94419d8a 100644
--- a/lisp/use-package/use-package-ensure.el
+++ b/lisp/use-package/use-package-ensure.el
@@ -134,7 +134,7 @@ manually updated package."
134 134
135(defun use-package-normalize/:ensure (name keyword args) 135(defun use-package-normalize/:ensure (name keyword args)
136 (if (null args) 136 (if (null args)
137 t 137 (list t)
138 (use-package-only-one (symbol-name keyword) args 138 (use-package-only-one (symbol-name keyword) args
139 #'(lambda (label arg) 139 #'(lambda (label arg)
140 (pcase arg 140 (pcase arg
diff --git a/test/lisp/use-package/use-package-tests.el b/test/lisp/use-package/use-package-tests.el
index 76e0be5105b..938e990b856 100644
--- a/test/lisp/use-package/use-package-tests.el
+++ b/test/lisp/use-package/use-package-tests.el
@@ -1469,6 +1469,14 @@
1469 (ignore 1469 (ignore
1470 (bind-keys :package mu4e ("<f9>" . mu4e)))))) 1470 (bind-keys :package mu4e ("<f9>" . mu4e))))))
1471 1471
1472(ert-deftest use-package-test/543 ()
1473 (match-expansion
1474 (use-package hydra
1475 :ensure)
1476 `(progn
1477 (use-package-ensure-elpa 'hydra '(t) 'nil)
1478 (require 'hydra nil nil))))
1479
1472(ert-deftest bind-key/:prefix-map () 1480(ert-deftest bind-key/:prefix-map ()
1473 (match-expansion 1481 (match-expansion
1474 (bind-keys :prefix "<f1>" 1482 (bind-keys :prefix "<f1>"