summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2015-03-15 20:07:16 -0400
committerJohn Wiegley <johnw@newartisans.com>2015-03-15 20:07:16 -0400
commit1c5f9247aa9de883f099bda71b80c01025b993a9 (patch)
treee95c80b77396a04e6ea8d1f6df615b128afb5013 /lisp
parent98b642b794dfbeb7476b9ad1202809c1c5dce789 (diff)
parent1f20acfd57e93fd749c536dc24f5dcfdbe43e417 (diff)
downloademacs-1c5f9247aa9de883f099bda71b80c01025b993a9.tar.gz
emacs-1c5f9247aa9de883f099bda71b80c01025b993a9.tar.bz2
emacs-1c5f9247aa9de883f099bda71b80c01025b993a9.zip
Merge pull request from npostavs/eval-after-name
use--package: eval-after-load name GitHub-reference: https://github.com/jwiegley/use-package/issues/168
Diffstat (limited to 'lisp')
-rw-r--r--lisp/use-package/use-package.el6
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/use-package/use-package.el b/lisp/use-package/use-package.el
index 50b1431759e..17543e3e734 100644
--- a/lisp/use-package/use-package.el
+++ b/lisp/use-package/use-package.el
@@ -329,7 +329,7 @@ the user specified.")
(ignore
(display-warning 'use-package (format ,fmt ,err) :error)))))))
-(defun use--package (name-symbol name-string args)
+(defun use--package (name name-symbol name-string args)
"See docstring for `use-package'."
(let*
((commands (plist-get args :commands))
@@ -424,7 +424,7 @@ the user specified.")
,(format "Configuring package %s"
name-string)
,@config-body)))
- (list `(eval-after-load ,name-string
+ (list `(eval-after-load ',name
',body)))))
`((use-package-with-elapsed-timer
,(format "Loading package %s" name-string)
@@ -503,7 +503,7 @@ this file. Usage:
;; At this point, we can expand the macro using the helper function.
;; `use--package'.
(let*
- ((body (use--package name-symbol name-string args*))
+ ((body (use--package name name-symbol name-symbol args*))
(pred (plist-get args* :if))
(expansion (if pred
`(when ,pred ,@body)