diff options
| author | Gerd Moellmann <gerd@gnu.org> | 2000-03-30 11:38:38 +0000 |
|---|---|---|
| committer | Gerd Moellmann <gerd@gnu.org> | 2000-03-30 11:38:38 +0000 |
| commit | c59a4192289926d6e1986af7a93939ab60900ad8 (patch) | |
| tree | 6e45095fccce42d6655f456feee430516086ece8 /lisp/emacs-lisp | |
| parent | 95875d9635052f36d9d93f9decafe6de95644810 (diff) | |
| download | emacs-c59a4192289926d6e1986af7a93939ab60900ad8.tar.gz emacs-c59a4192289926d6e1986af7a93939ab60900ad8.tar.bz2 emacs-c59a4192289926d6e1986af7a93939ab60900ad8.zip | |
(byte-compile-inline-expand): Fix bug
trying to `load' the symbol of an autoload instead of the file
recorded in the autoload. Fix error messages.
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/byte-opt.el | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el index 24770a12197..78f14ab81d2 100644 --- a/lisp/emacs-lisp/byte-opt.el +++ b/lisp/emacs-lisp/byte-opt.el @@ -260,16 +260,17 @@ (and (fboundp name) (symbol-function name))))) (if (null fn) (progn - (byte-compile-warn "attempt to inline %s before it was defined" name) + (byte-compile-warn "Attempt to inline `%s' before it was defined" + name) form) ;; else (if (and (consp fn) (eq (car fn) 'autoload)) (progn - (load (nth 1 fn)) + (load (nth 2 fn)) (setq fn (or (cdr (assq name byte-compile-function-environment)) (and (fboundp name) (symbol-function name)))))) (if (and (consp fn) (eq (car fn) 'autoload)) - (error "file \"%s\" didn't define \"%s\"" (nth 1 fn) name)) + (error "File `%s' didn't define `%s'" (nth 2 fn) name)) (if (symbolp fn) (byte-compile-inline-expand (cons fn (cdr form))) (if (byte-code-function-p fn) |