[elpa] externals/setup bfac291baf: Partially revert previous commit

[ELPA Syncer]

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

    Partially revert previous commit
    
    We don't want to quit a body just because the last form might evaluate
    to nil.
---
 setup.el | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/setup.el b/setup.el
index 2a9a4c84ba..00909be5ce 100644
--- a/setup.el
+++ b/setup.el
@@ -664,7 +664,9 @@ yourself."
 
 (setup-define :and
   (lambda (&rest conds)
-    `(or (and ,@conds) ,(setup-quit)))
+    `(if (and ,@(butlast conds))
+         ,@(last conds)
+       ,(setup-quit)))
   :documentation "Abort evaluation of CONDS are not all true.
 The expression of the last condition is used to deduce the
 feature context."