diff options
| author | John Wiegley <johnw@newartisans.com> | 2015-06-10 18:12:32 -0500 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2015-06-10 18:12:32 -0500 |
| commit | 4502a5ecb10400d3a792cc22438b59ba59b194b3 (patch) | |
| tree | fc7a35fa7510506ec57264f7314fa98808a82e93 /lisp/use-package | |
| parent | f1a00054b13f77f9d8f7c58de7978ff3b6d4b683 (diff) | |
| parent | 90e3f4811144c0dcef05162892e8117e9577bb12 (diff) | |
| download | emacs-4502a5ecb10400d3a792cc22438b59ba59b194b3.tar.gz emacs-4502a5ecb10400d3a792cc22438b59ba59b194b3.tar.bz2 emacs-4502a5ecb10400d3a792cc22438b59ba59b194b3.zip | |
Merge pull request from syl20bnr/fix_hook_injection
Fix calls to run-hooks for :init and :config injected hooks
GitHub-reference: https://github.com/jwiegley/use-package/issues/213
Diffstat (limited to 'lisp/use-package')
| -rw-r--r-- | lisp/use-package/use-package.el | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lisp/use-package/use-package.el b/lisp/use-package/use-package.el index 6feb0d84a5c..444a48ca511 100644 --- a/lisp/use-package/use-package.el +++ b/lisp/use-package/use-package.el @@ -181,16 +181,16 @@ ARGS is a list of forms, so `((foo))' if only `foo' is being called." (when body `((when ,(macroexp-progn (use-package-expand name-string (format "pre-%s hook" keyword) - `(run-hook-with-args-until-failure - ',(intern (concat "use-package--" name-string - "--pre-" keyword-name "-hook"))))) + `((run-hook-with-args-until-failure + ',(intern (concat "use-package--" name-string + "--pre-" keyword-name "-hook")))))) ,(macroexp-progn (use-package-expand name-string (format "%s" keyword) body)) ,(macroexp-progn (use-package-expand name-string (format "post-%s hook" keyword) - `(run-hooks - ',(intern (concat "use-package--" name-string - "--post-" keyword-name "-hook"))))))))))) + `((run-hooks + ',(intern (concat "use-package--" name-string + "--post-" keyword-name "-hook")))))))))))) (defun use-package--with-elapsed-timer (text body) "BODY is a list of forms, so `((foo))' if only `foo' is being called." |