From: Gerd Möllmann <gerd@gnu.org>
Date: Wed, 23 Aug 2023 11:03:43 +0000 (+0200)
Subject: Revert "; Reverse debug spec of cl-flet (bug#65344)"
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=999de2a5ea368451300e205d1beb01a193070eb4;p=emacs.git

Revert "; Reverse debug spec of cl-flet (bug#65344)"

This reverts commit cc0f546825e0db9ff78f82c62615686aa480a133.
---

diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el
index 254a10781fe..4cc43995c12 100644
--- a/lisp/emacs-lisp/cl-macs.el
+++ b/lisp/emacs-lisp/cl-macs.el
@@ -2075,22 +2075,15 @@ info node `(cl) Function Bindings' for details.
 
 \(fn ((FUNC ARGLIST BODY...) ...) FORM...)"
   (declare (indent 1)
-           (debug ((&rest [&or
-                           ;; This spec must come first so that a
-                           ;; binding of the form (FN FORM) is always
-                           ;; interpreted as FORM being a form
-                           ;; returning a function, instead of FORM
-                           ;; being a cl-lambda-list and FN returning
-                           ;; nil.
-                           (&define [&name symbolp "@cl-flet@"]
-                                    [&name [] gensym] ;Make it unique!
-                                    def-form)
-                           (&define [&name symbolp "@cl-flet@"]
-                                    [&name [] gensym] ;Make it unique!
-                                    cl-lambda-list
-                                    cl-declarations-or-string
-                                    [&optional ("interactive" interactive)]
-                                    def-body)])
+           (debug ((&rest [&or (&define [&name symbolp "@cl-flet@"]
+                                        [&name [] gensym] ;Make it unique!
+                                        cl-lambda-list
+                                        cl-declarations-or-string
+                                        [&optional ("interactive" interactive)]
+                                        def-body)
+                               (&define [&name symbolp "@cl-flet@"]
+                                        [&name [] gensym] ;Make it unique!
+                                        def-form)])
                    cl-declarations body)))
   (let ((binds ()) (newenv macroexpand-all-environment))
     (dolist (binding bindings)