1 files changed, 11 insertions, 10 deletions

@@ -80,21 +80,22 @@ If PATH does not exist, abort the evaluation."
 
 ;;; Straight.el
 
-(with-eval-after-load 'straight
-  (defun setup--straight-handle-arg (arg var)
-    (cond
-     ((and (boundp var) (symbol-value var)) t)
-     ((keywordp arg) (set var t))
-     ((functionp arg) (set var nil) (funcall arg))
-     ((listp arg) (set var nil) (eval arg :lexical))))
+(defun setup--straight-handle-arg (arg var)
+  (cond
+   ((and (boundp var) (symbol-value var)) t)
+   ((keywordp arg) (set var t))
+   ((functionp arg) (set var nil) (funcall arg))
+   ((listp arg) (set var nil) arg)))
 
+(with-eval-after-load 'straight
   (setup-define :straight
     (lambda (recipe &rest predicates)
       (let* ((skp (make-symbol "straight-keyword-p"))
              (straight-use-p
-              (cl-every (lambda (f) (setup--straight-handle-arg f skp))
-                        predicates))
-             (form `(unless (and ,straight-use-p
+              (cl-mapcar
+                 (lambda (f) (setup--straight-handle-arg f skp))
+                 predicates))
+             (form `(unless (and ,@straight-use-p
                                  (condition-case e
                                      (straight-use-package ',recipe)
                                    (error