[Emacs-diffs] Changes to emacs/lisp/emacs-lisp/autoload.el,v

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        07/07/10 14:13:17

Index: emacs-lisp/autoload.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/emacs-lisp/autoload.el,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -b -r1.127 -r1.128
--- emacs-lisp/autoload.el      7 Jul 2007 04:56:00 -0000       1.127
+++ emacs-lisp/autoload.el      10 Jul 2007 14:13:15 -0000      1.128
@@ -559,6 +559,7 @@
                                 (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,9 +593,9 @@
                           (push file no-autoloads)
                           (setq files (delete file files)))))))
                  ((not (stringp file)))
-                 ((not (and (file-exists-p file)
+                 ((or (not (file-exists-p file))
                              ;; Remove duplicates as well, just in case.
-                             (member file files)))
+                       (member file done))
                   ;; Remove the obsolete section.
                   (autoload-remove-section (match-beginning 0)))
                  ((not (time-less-p (nth 4 form)
@@ -606,6 +607,7 @@
                    (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)