[Emacs-diffs] Changes to emacs/lisp/emacs-lisp/cl-macs.el,v

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       08/10/23 02:40:16

Index: cl-macs.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/emacs-lisp/cl-macs.el,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -b -r1.76 -r1.77
--- cl-macs.el  16 Jul 2008 02:50:00 -0000      1.76
+++ cl-macs.el  23 Oct 2008 02:40:09 -0000      1.77
@@ -1328,10 +1328,14 @@
             (let ((func (list 'function*
                               (list 'lambda (cadr x)
                                     (list* 'block (car x) (cddr x))))))
-              (if (and (cl-compiling-file)
-                       (boundp 'byte-compile-function-environment))
+              (when (cl-compiling-file)
+                ;; Bug#411.  It would be nice to fix this.
+                (and (get (car x) 'byte-compile)
+                     (error "Byte-compiling a redefinition of `%s' \
+will not work - use `labels' instead" (symbol-name (car x))))
+                (and (boundp 'byte-compile-function-environment)
                   (push (cons (car x) (eval func))
-                           byte-compile-function-environment))
+                           byte-compile-function-environment)))
               (list (list 'symbol-function (list 'quote (car x))) func))))
          bindings)
         body))