diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2012-10-11 16:08:38 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2012-10-11 16:08:38 -0400 |
| commit | 5253a5fd755a26e30c73653bc49066f0649ec0eb (patch) | |
| tree | 2b0d0acea8460e0b881dd90156c89aca55c73650 /lisp/emacs-lisp | |
| parent | ac9fc2c779445a88cdf0ae2fa042879bb7ff0d16 (diff) | |
| download | emacs-5253a5fd755a26e30c73653bc49066f0649ec0eb.tar.gz emacs-5253a5fd755a26e30c73653bc49066f0649ec0eb.tar.bz2 emacs-5253a5fd755a26e30c73653bc49066f0649ec0eb.zip | |
Fix spurious "cl--defsubst-expand might not be defined at runtime"
* lisp/emacs-lisp/bytecomp.el (byte-compile-eval): Adjust to long-ago
changes to the format of load-history.
* src/eval.c (Fautoload): Remember previous autoload status in load-history.
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/bytecomp.el | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index 4dd44bb6f22..7534ce5eaca 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el @@ -875,13 +875,11 @@ Each function's symbol gets added to `byte-compile-noruntime-functions'." (byte-compile-cl-file-p (car xs)))) (dolist (s xs) (cond - ((symbolp s) - (unless (memq s old-autoloads) - (push s byte-compile-noruntime-functions))) ((and (consp s) (eq t (car s))) (push (cdr s) old-autoloads)) - ((and (consp s) (eq 'autoload (car s))) - (push (cdr s) byte-compile-noruntime-functions))))))) + ((and (consp s) (memq (car s) '(autoload defun))) + (unless (memq (cdr s) old-autoloads) + (push (cdr s) byte-compile-noruntime-functions)))))))) ;; Go through current-load-list for the locally defined funs. (let (old-autoloads) (while (and hist-nil-new (not (eq hist-nil-new hist-nil-orig))) |