(byte-compile-file-form-autoload): Use the

same definition in byte-compile-function-environment as `autoload'
would put in `symbol-function'.

2 files changed, 15 insertions, 6 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5fed6126f63..8b9eb130bc2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2001-05-27  Stefan Monnier  <monnier@cs.yale.edu>
+
+        * emacs-lisp/bytecomp.el (byte-compile-file-form-autoload): Use the
+        same definition in byte-compile-function-environment as `autoload'
+        would put in `symbol-function'.
+
+        * emacs-lisp/byte-opt.el (byte-compile-inline-expand): Complete Dave's
+        patch to correct the error message as well.
+
 2001-05-27  Eli Zaretskii  <eliz@is.elta.co.il>
 
         * cus-edit.el (custom-file): Don't assume we were invoked with -q
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 6ade734984d..4c6881e0b0a 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -10,7 +10,7 @@
 
 ;;; This version incorporates changes up to version 2.10 of the
 ;;; Zawinski-Furuseth compiler.
-(defconst byte-compile-version "$Revision: 2.81 $")
+(defconst byte-compile-version "$Revision: 2.82 $")
 
 ;; This file is part of GNU Emacs.
 
@@ -1836,7 +1836,7 @@ list that represents a doc string reference.
            (symbolp (nth 1 (nth 1 form))))
       (add-to-list 'byte-compile-function-environment
                    (cons (nth 1 (nth 1 form))
-                         form)))
+                         (cons 'autoload (cdr (cdr form))))))
   (if (stringp (nth 3 form))
       form
     ;; No doc string, so we can compile this as a normal form.
@@ -3641,10 +3641,10 @@ For example, invoke `emacs -batch -f batch-byte-recompile-directory .'."
       (assq 'byte-code (symbol-function 'byte-compile-form))
       (let ((byte-optimize nil)         ; do it fast
             (byte-compile-warnings nil))
-        (mapcar '(lambda (x)
-                   (or noninteractive (message "compiling %s..." x))
-                   (byte-compile x)
-                   (or noninteractive (message "compiling %s...done" x)))
+        (mapcar (lambda (x)
+                  (or noninteractive (message "compiling %s..." x))
+                  (byte-compile x)
+                  (or noninteractive (message "compiling %s...done" x)))
                 '(byte-compile-normal-call
                   byte-compile-form
                   byte-compile-body