summaryrefslogtreecommitdiff
path: root/lisp/use-package/use-package.el
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2017-04-05 10:28:15 -0700
committerGitHub <noreply@github.com>2017-04-05 10:28:15 -0700
commit0a12111d2fd0703f41d998cf0bdb923801d2eb22 (patch)
treea811ad3895390ff70e4568ea9bd5dc14e3d5137d /lisp/use-package/use-package.el
parent2db2b56b17ac9a5125cce4bc2b41298bd1d34476 (diff)
parenta9ffffcee5c8047db5b00625790ab9d1b1eccc4b (diff)
downloademacs-0a12111d2fd0703f41d998cf0bdb923801d2eb22.tar.gz
emacs-0a12111d2fd0703f41d998cf0bdb923801d2eb22.tar.bz2
emacs-0a12111d2fd0703f41d998cf0bdb923801d2eb22.zip
Merge pull request from raxod502/normalize-nil
Make use-package-normalize-value handle nil better GitHub-reference: https://github.com/jwiegley/use-package/issues/449
Diffstat (limited to 'lisp/use-package/use-package.el')
-rw-r--r--lisp/use-package/use-package.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/use-package/use-package.el b/lisp/use-package/use-package.el
index 02a358c7145..74f1f309436 100644
--- a/lisp/use-package/use-package.el
+++ b/lisp/use-package/use-package.el
@@ -778,7 +778,8 @@ If the package is installed, its entry is removed from
(defsubst use-package-normalize-value (label arg)
"Normalize a value."
- (cond ((symbolp arg)
+ (cond ((null arg) nil)
+ ((symbolp arg)
`(symbol-value ',arg))
((functionp arg)
`(funcall #',arg))