diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2007-07-10 14:13:16 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2007-07-10 14:13:16 +0000 |
| commit | 48df920c8702611c3b447856bdd8a97d68e38f93 (patch) | |
| tree | b9e7e1a26c39c63bae6d1707cd070537fe2fff0e /lisp/emacs-lisp/autoload.el | |
| parent | 4d1daf5961ef41f59713aabc3e044051ce78041b (diff) | |
| download | emacs-48df920c8702611c3b447856bdd8a97d68e38f93.tar.gz | |
(update-directory-autoloads): Remove duplicates without also removing
entries from other directories.
Diffstat (limited to 'lisp/emacs-lisp/autoload.el')
| -rw-r--r-- | lisp/emacs-lisp/autoload.el | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el index 30b7c7e1937..0fa89f2a173 100644 --- a/lisp/emacs-lisp/autoload.el +++ b/lisp/emacs-lisp/autoload.el @@ -559,6 +559,7 @@ directory or directories specified." (directory-files (expand-file-name dir) t files-re)) dirs))) + (done ()) (this-time (current-time)) ;; Files with no autoload cookies or whose autoloads go to other ;; files because of file-local autoload-generated-file settings. @@ -592,10 +593,10 @@ directory or directories specified." (push file no-autoloads) (setq files (delete file files))))))) ((not (stringp file))) - ((not (and (file-exists-p file) - ;; Remove duplicates as well, just in case. - (member file files))) - ;; Remove the obsolete section. + ((or (not (file-exists-p file)) + ;; Remove duplicates as well, just in case. + (member file done)) + ;; Remove the obsolete section. (autoload-remove-section (match-beginning 0))) ((not (time-less-p (nth 4 form) (nth 5 (file-attributes file)))) @@ -606,6 +607,7 @@ directory or directories specified." (if (autoload-generate-file-autoloads file (current-buffer) buffer-file-name) (push file no-autoloads)))) + (push file done) (setq files (delete file files))))) ;; Elements remaining in FILES have no existing autoload sections yet. (dolist (file files) |