From 19ab94cf39809dc1aebce053962930b6c6ab6c4d Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Wed, 18 Mar 2015 20:53:55 -0500 Subject: [PATCH] Wrap the :preface in an eval-and-compile block --- lisp/use-package/use-package.el | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/lisp/use-package/use-package.el b/lisp/use-package/use-package.el index e2054d11978..4d30ffe3ca3 100644 --- a/lisp/use-package/use-package.el +++ b/lisp/use-package/use-package.el @@ -74,9 +74,9 @@ then the expanded macros do their job silently." :group 'use-package) (defcustom use-package-inject-hooks nil - "If non-nil, add hooks to the `:init' and `:config' sections for a package. + "If non-nil, add hooks to the `:init' and `:config' sections. In particular, for a given package `foo', the following hooks -will become available: +become available: `use-package--foo--pre-init-hook' `use-package--foo--post-init-hook' @@ -100,9 +100,8 @@ This disables: - Printing to the *Messages* buffer of slowly-evaluating forms - Capture of load errors (normally redisplayed as warnings) - Conditional loading of packages (load failures become errors) -The only real advantage is that, if you know your configuration -works, then your byte-compiled init file is as minimal as -possible." +The only advantage is that, if you know your configuration works, +then your byte-compiled init file is as minimal as possible." :type 'boolean :group 'use-package) @@ -469,7 +468,9 @@ ARGS is a list of forms, so `((foo))' if only `foo' is being called." pre-compile-load - (plist-get args :preface) + (mapcar #'(lambda (form) + `(eval-and-compile ,form)) + (plist-get args :preface)) ;; Setup any required autoloads (if defer-loading @@ -606,7 +607,7 @@ this file. Usage: `(not (member nil (mapcar #'featurep ',requires))) `(featurep ',requires)) ,@expansion)))))) - ;; (message "Expanded: %s" (pp-to-string body*)) + ;; (message "Expanded:\n%s" (pp-to-string body*)) `(let ((byte-compile-warnings byte-compile-warnings)) (byte-compile-disable-warning 'redefined) ,body*))))) -- 2.39.2