summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2015-03-16 22:12:52 -0500
committerJohn Wiegley <johnw@newartisans.com>2015-03-16 22:12:52 -0500
commit771f2edc83a2d48e9d46975c6433c4f16f449a7b (patch)
tree8af89f007d23cd08a65126a3e59bd8977e67e3fb
parentdb69a3f81c0158cf9615dc3f19a6412d2b61446a (diff)
downloademacs-771f2edc83.tar.gz
Always return t on a successful init-time load
Fixes https://github.com/jwiegley/use-package/issues/174
-rw-r--r--lisp/use-package/use-package.el21
1 files changed, 14 insertions, 7 deletions
diff --git a/lisp/use-package/use-package.el b/lisp/use-package/use-package.el
index 224eb375028..561b12d74a5 100644
--- a/lisp/use-package/use-package.el
+++ b/lisp/use-package/use-package.el
@@ -105,6 +105,9 @@ possible."
:type 'boolean
:group 'use-package)
+(eval-when-compile
+ (defvar use-package-expand-minimally))
+
(defmacro use-package-expand (name label form)
(declare (indent 1))
(when form
@@ -479,7 +482,8 @@ possible."
(if config-body
`((eval-after-load ',name
;; '(,config-defun)
- ',config-body*))))
+ ',config-body*)))
+ (list t))
`(,(macroexpand
`(use-package-with-elapsed-timer
,(format "Loading package %s" name-string)
@@ -488,15 +492,18 @@ possible."
(use-package-cat-maybes
(list `(require ',name-symbol))
bindings
- (list config-body*)))
+ config-body
+ (list t)))
`(if (not (require ',name-symbol nil t))
- (display-warning
- 'use-package
- (format "Could not load package %s" ,name-string)
- :error)
+ (ignore
+ (display-warning
+ 'use-package
+ (format "Could not load package %s" ,name-string)
+ :error))
,@(use-package-cat-maybes
bindings
- (list config-body*)))))))))))
+ config-body
+ (list t)))))))))))
(defmacro use-package (name &rest args)
"Declare an Emacs package by specifying a group of configuration options.