(byte-compile-unfold-lambda): Don't

recursively optimize body because that can lead to infinite
recursion; see comment there.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 843de781e06bc9cf93fd75621a53127f19ae8f4b..50fd8376e45ceed1d8f8eb6aa0d8cd3bdd45b330 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2000-11-14  Gerd Moellmann  <gerd@gnu.org>
+
+       * emacs-lisp/byte-opt.el (byte-compile-unfold-lambda): Don't
+       recursively optimize body because that can lead to infinite
+       recursion; see comment there.
+
 2000-11-13  Eli Zaretskii  <eliz@is.elta.co.il>
 
        * faces.el (face-spec-set-match-display): Revert the change from

diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el
index c3c8e6772395baa670c9ec0a14f4d41fe5d65ece..da69538660482b8b64c2decb0638501eaff5677e 100644 (file)
--- a/lisp/emacs-lisp/byte-opt.el
+++ b/lisp/emacs-lisp/byte-opt.el
@@ -340,7 +340,12 @@
                (byte-compile-warn
                 "Attempt to open-code `%s' with too many arguments" name))
            form)
-       (setq body (mapcar 'byte-optimize-form body))
+       
+       ;; The following leads to infinite recursion when loading a
+       ;; file containing `(defsubst f () (f))', and then trying to
+       ;; byte-compile that file.
+       ;(setq body (mapcar 'byte-optimize-form body)))
+       
        (let ((newform 
               (if bindings
                   (cons 'let (cons (nreverse bindings) body))