summaryrefslogtreecommitdiff
path: root/lisp/use-package/use-package.el
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2016-07-18 09:10:49 -0700
committerGitHub <noreply@github.com>2016-07-18 09:10:49 -0700
commit811c99da52654d0605242814f812e44ef51835ad (patch)
tree37621da05668cc14ebbb85a2f17d1cf0aa33a7c8 /lisp/use-package/use-package.el
parent758739e6dbf82c6ad4ee0f1fa93bc2093be50956 (diff)
parent79c38c5184e174c11922ed59568e1070201112f7 (diff)
downloademacs-811c99da52654d0605242814f812e44ef51835ad.tar.gz
emacs-811c99da52654d0605242814f812e44ef51835ad.tar.bz2
emacs-811c99da52654d0605242814f812e44ef51835ad.zip
Merge pull request from npostavs/state-noconst
Some minor fixes GitHub-reference: https://github.com/jwiegley/use-package/issues/342
Diffstat (limited to 'lisp/use-package/use-package.el')
-rw-r--r--lisp/use-package/use-package.el8
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/use-package/use-package.el b/lisp/use-package/use-package.el
index cdff6ce772e..f81b64a02c7 100644
--- a/lisp/use-package/use-package.el
+++ b/lisp/use-package/use-package.el
@@ -46,7 +46,7 @@
(eval-when-compile (require 'cl))
(eval-when-compile (require 'regexp-opt))
-(declare-function package-installed-p 'package)
+(declare-function package-installed-p "package")
(defgroup use-package nil
"A use-package declaration for simplifying your `.emacs'."
@@ -212,8 +212,8 @@ convert it to a string and return that."
"Return a form which will load or require NAME depending on
whether it's a string or symbol."
(if (stringp name)
- `(load ,name 'noerror)
- `(require ',name nil 'noerror)))
+ `(load ,name ',noerror)
+ `(require ',name nil ',noerror)))
(defun use-package-expand (name label form)
"FORM is a list of forms, so `((foo))' if only `foo' is being called."
@@ -1167,7 +1167,7 @@ this file. Usage:
(let ((body
(macroexp-progn
(use-package-process-keywords name args*
- (and use-package-always-defer '(:deferred t))))))
+ (and use-package-always-defer (list :deferred t))))))
(if use-package-debug
(display-buffer
(save-current-buffer