From: John Wiegley <johnw@newartisans.com>
Date: Thu, 21 Jun 2012 04:03:27 +0000 (-0500)
Subject: Added :pre-init
X-Git-Tag: emacs-29.0.90~1306^2~15^2~474
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d9f6c0f370;p=emacs.git

Added :pre-init
---

diff --git a/lisp/use-package/use-package.el b/lisp/use-package/use-package.el
index 204dcae4a71..1f8f7b4c503 100644
--- a/lisp/use-package/use-package.el
+++ b/lisp/use-package/use-package.el
@@ -309,6 +309,7 @@
 
 (defmacro use-package (name &rest args)
   (let* ((commands (plist-get args :commands))
+         (pre-init-body (plist-get args :pre-init))
          (init-body (plist-get args :init))
          (config-body (plist-get args :config))
          (diminish-var (plist-get args :diminish))
@@ -425,8 +426,9 @@
                       commands)
 
                 `(when ,(or predicate t)
-                   ,init-body
+                   ,pre-init-body
                    ,@form
+                   ,init-body
                    ,(unless (null config-body)
                       `(eval-after-load ,name-string
                          '(if ,requires-test
@@ -442,6 +444,7 @@
                                  `(load ,name t)
                                `(require ',name nil t)))
                        (message "Could not load package %s" ,name-string)
+                     ,pre-init-body
                      ,init-body
                      ,config-body
                      t))))))))