diff options
| author | Kenichi Handa <handa@gnu.org> | 2012-10-14 17:06:11 +0900 |
|---|---|---|
| committer | Kenichi Handa <handa@gnu.org> | 2012-10-14 17:06:11 +0900 |
| commit | 9fe32d61c5655878f877522ac4bcc251d092f732 (patch) | |
| tree | 584f4c85fd2e44e8e7d597382f177359b737acb1 /lisp/emacs-lisp/bytecomp.el | |
| parent | f5772b8eaee90d0b50a60bd55d9d28805a2543cb (diff) | |
| parent | 8111f5e6f05228e36496f3bdccad711f569acb9b (diff) | |
| download | emacs-9fe32d61c5655878f877522ac4bcc251d092f732.tar.gz emacs-9fe32d61c5655878f877522ac4bcc251d092f732.tar.bz2 emacs-9fe32d61c5655878f877522ac4bcc251d092f732.zip | |
merge trunk
Diffstat (limited to 'lisp/emacs-lisp/bytecomp.el')
| -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))) |