From: John Wiegley <johnw@newartisans.com>
Date: Tue, 17 Mar 2015 03:12:52 +0000 (-0500)
Subject: Always return t on a successful init-time load
X-Git-Tag: emacs-29.0.90~1306^2~15^2~374
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=771f2edc83;p=emacs.git

Always return t on a successful init-time load

Fixes https://github.com/jwiegley/use-package/issues/174
---

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.