diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 9 | ||||
| -rw-r--r-- | lisp/emacs-lisp/autoload.el | 14 |
2 files changed, 17 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 684d1bcffbb..ed1a708a29d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,12 @@ +2009-12-10 Stefan Monnier <monnier@iro.umontreal.ca> + + Let loaddefs.el adjust to changes in autoload-excludes (bug#5162). + * emacs-lisp/autoload.el (autoload-generate-file-autoloads): + Disregard autoload-excludes. + (update-directory-autoloads): Obey autoload-excludes here instead. + But don't store its contents in no-autoloads and remove entries that + refer to excludes files. + 2009-12-10 Glenn Morris <rgm@gnu.org> * mail/feedmail.el (top-level): Move require 'mail-utils to start. diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el index 5171d142c24..f135f253ce8 100644 --- a/lisp/emacs-lisp/autoload.el +++ b/lisp/emacs-lisp/autoload.el @@ -372,8 +372,6 @@ Return non-nil if and only if FILE adds no autoloads to OUTFILE relfile ;; nil until we found a cookie. output-start) - (if (member absfile autoload-excludes) - (message "Generating autoloads for %s...skipped" file) (with-current-buffer (or visited ;; It is faster to avoid visiting the file. (autoload-find-file file)) @@ -482,7 +480,7 @@ Return non-nil if and only if FILE adds no autoloads to OUTFILE (message "Generating autoloads for %s...done" file)) (or visited ;; We created this buffer, so we should kill it. - (kill-buffer (current-buffer))))) + (kill-buffer (current-buffer)))) ;; If the entries were added to some other buffer, then the file ;; doesn't add entries to OUTFILE. (or (not output-start) otherbuf)))) @@ -638,7 +636,9 @@ directory or directories specified." ((not (stringp file))) ((or (not (file-exists-p file)) ;; Remove duplicates as well, just in case. - (member file done)) + (member file done) + ;; If the file is actually excluded. + (member (expand-file-name file) autoload-excludes)) ;; Remove the obsolete section. (autoload-remove-section (match-beginning 0))) ((not (time-less-p (nth 4 form) @@ -654,8 +654,10 @@ directory or directories specified." (setq files (delete file files))))) ;; Elements remaining in FILES have no existing autoload sections yet. (dolist (file files) - (if (autoload-generate-file-autoloads file nil buffer-file-name) - (push file no-autoloads))) + (cond + ((member (expand-file-name file) autoload-excludes) nil) + ((autoload-generate-file-autoloads file nil buffer-file-name) + (push file no-autoloads)))) (when no-autoloads ;; Sort them for better readability. |