From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Sat, 24 Jun 2023 15:44:32 +0000 (-0400)
Subject: * lisp/emacs-lisp/cl-macs.el (cl--slet): Unbreak bootstrap
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f559bd1248a265662665c462b750eb5fc64dd811;p=emacs.git

* lisp/emacs-lisp/cl-macs.el (cl--slet): Unbreak bootstrap
---

diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el
index 4caa573ea9d..540bcc7f3b3 100644
--- a/lisp/emacs-lisp/cl-macs.el
+++ b/lisp/emacs-lisp/cl-macs.el
@@ -245,17 +245,20 @@ The name is made by appending a number to PREFIX, default \"T\"."
 
 (defun cl--slet (bindings body)
   "Like `cl--slet*' but for \"parallel let\"."
-  (cond
-   ((seq-some (lambda (binding) (macroexp--dynamic-variable-p (car binding)))
-              bindings)
-    ;; FIXME: We use `identity' to obfuscate the code enough to
-    ;; circumvent the known bug in `macroexp--unfold-lambda' :-(
-    `(funcall (identity (lambda (,@(mapcar #'car bindings))
-                          ,@(macroexp-unprogn body)))
-              ,@(mapcar #'cadr bindings)))
-   ((null (cdr bindings))
-    (macroexp-let* bindings body))
-   (t `(let ,bindings ,@(macroexp-unprogn body)))))
+  (let ((dyn nil)) ;Is there a var declared as dynbound among the bindings?
+    ;; `seq-some' lead to bootstrap problems.
+    (dolist (binding bindings)
+      (if (macroexp--dynamic-variable-p (car binding)) (setq dyn t)))
+    (cond
+     (dyn
+      ;; FIXME: We use `identity' to obfuscate the code enough to
+      ;; circumvent the known bug in `macroexp--unfold-lambda' :-(
+      `(funcall (identity (lambda (,@(mapcar #'car bindings))
+                            ,@(macroexp-unprogn body)))
+                ,@(mapcar #'cadr bindings)))
+     ((null (cdr bindings))
+      (macroexp-let* bindings body))
+     (t `(let ,bindings ,@(macroexp-unprogn body))))))
 
 (defun cl--slet* (bindings body)
   "Like `macroexp-let*' but uses static scoping for all the BINDINGS."