Commit 7aec540f authored by Richard M. Stallman's avatar Richard M. Stallman
Browse files

(byte-compile-inline-expand): Recalculate fn

after loading a file to define the function.
parent 75e9c107
...@@ -270,7 +270,10 @@ ...@@ -270,7 +270,10 @@
form) form)
;; else ;; else
(if (and (consp fn) (eq (car fn) 'autoload)) (if (and (consp fn) (eq (car fn) 'autoload))
(load (nth 1 fn))) (progn
(load (nth 1 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)) (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 1 fn) name))
(if (symbolp fn) (if (symbolp fn)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment