aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman1997-01-27 02:40:13 +0000
committerRichard M. Stallman1997-01-27 02:40:13 +0000
commit7aec540f0c8899925a11cdf9876d93ed7bd7fc7f (patch)
treed4cac3e19ae8faf751b372bb40273fb627d20382
parent75e9c107ee12a46b088644cf3dadef53eed8c9b8 (diff)
downloademacs-7aec540f0c8899925a11cdf9876d93ed7bd7fc7f.tar.gz
emacs-7aec540f0c8899925a11cdf9876d93ed7bd7fc7f.zip
(byte-compile-inline-expand): Recalculate fn
after loading a file to define the function.
-rw-r--r--lisp/emacs-lisp/byte-opt.el5
1 files changed, 4 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el
index ef2880c7d9b..4b7b9f305e6 100644
--- a/lisp/emacs-lisp/byte-opt.el
+++ b/lisp/emacs-lisp/byte-opt.el
@@ -270,7 +270,10 @@
270 form) 270 form)
271 ;; else 271 ;; else
272 (if (and (consp fn) (eq (car fn) 'autoload)) 272 (if (and (consp fn) (eq (car fn) 'autoload))
273 (load (nth 1 fn))) 273 (progn
274 (load (nth 1 fn))
275 (setq fn (or (cdr (assq name byte-compile-function-environment))
276 (and (fboundp name) (symbol-function name))))))
274 (if (and (consp fn) (eq (car fn) 'autoload)) 277 (if (and (consp fn) (eq (car fn) 'autoload))
275 (error "file \"%s\" didn't define \"%s\"" (nth 1 fn) name)) 278 (error "file \"%s\" didn't define \"%s\"" (nth 1 fn) name))
276 (if (symbolp fn) 279 (if (symbolp fn)