diff options
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/emacs-lisp/byte-opt.el | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ca950dcb3b3..46cf276f2cf 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2001-05-25 Stefan Monnier <monnier@cs.yale.edu> | ||
| 2 | |||
| 3 | * emacs-lisp/byte-opt.el (byte-compile-inline-expand): | ||
| 4 | Fix the arg of `load'. From Dave Love <fx@gnu.org>. | ||
| 5 | |||
| 1 | 2001-05-25 Andrew Choi <akochoi@i-cable.com> | 6 | 2001-05-25 Andrew Choi <akochoi@i-cable.com> |
| 2 | 7 | ||
| 3 | * international/titdic-cnv.el (ctlau-gb-converter): `\' should | 8 | * international/titdic-cnv.el (ctlau-gb-converter): `\' should |
diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el index 5c713b13449..95c9e714372 100644 --- a/lisp/emacs-lisp/byte-opt.el +++ b/lisp/emacs-lisp/byte-opt.el | |||
| @@ -265,7 +265,7 @@ | |||
| 265 | form) | 265 | form) |
| 266 | ;; else | 266 | ;; else |
| 267 | (when (and (consp fn) (eq (car fn) 'autoload)) | 267 | (when (and (consp fn) (eq (car fn) 'autoload)) |
| 268 | (load (nth 2 fn)) | 268 | (load (nth 1 fn)) |
| 269 | (setq fn (or (and (fboundp name) (symbol-function name)) | 269 | (setq fn (or (and (fboundp name) (symbol-function name)) |
| 270 | (cdr (assq name byte-compile-function-environment))))) | 270 | (cdr (assq name byte-compile-function-environment))))) |
| 271 | (if (and (consp fn) (eq (car fn) 'autoload)) | 271 | (if (and (consp fn) (eq (car fn) 'autoload)) |