[elpa] externals/setup fe3bfc7 2/3: Make sure that :with-feature is a defined in setup

[Philip Kaludercic]

branch: externals/setup
commit fe3bfc71701e4e957dc2f66d0227329154243b6e
Author: Philip K <philipk@posteo.net>
Commit: Philip K <philipk@posteo.net>

    Make sure that :with-feature is a defined in setup
---
 setup.el | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/setup.el b/setup.el
index c85efc7..a0b1edf 100644
--- a/setup.el
+++ b/setup.el
@@ -111,9 +111,11 @@ NAME may also be a macro, if it can provide a symbol."
     (let ((shorthand (get (car name) 'setup-shorthand)))
       (setq name (and shorthand (funcall shorthand name)))))
   (macroexpand-all
-   `(catch 'setup-exit
-      (:with-feature ,name ,@body)
-      t)
+   (if (assq :with-feature setup-macros)
+       `(catch 'setup-exit
+          (:with-feature ,name ,@body)
+          t)
+     `(catch 'setup-exit ,(macroexp-progn body) t))
    (append setup-macros macroexpand-all-environment)))
 
 ;;;###autoload