(update-directory-autoloads): Remove duplicates without also removing

entries from other directories.

2 files changed, 27 insertions, 29 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 59d6c7fa57..2a9438965e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,18 +1,22 @@
+2007-07-10  Stefan Monnier  <[email protected]>
+
+	* emacs-lisp/autoload.el (update-directory-autoloads): Remove
+	duplicates without also removing entries from other directories.
+
 2007-07-10  Carsten Dominik  <[email protected]>
 
 	* textmodes/org.el (org-agenda-day-view, org-agenda-week-view):
 	Remember span as default.
-	(org-columns-edit-value): Renamed from `org-column-edit'.
-	(org-columns-display-here-title): Renamed from
+	(org-columns-edit-value): Rename from `org-column-edit'.
+	(org-columns-display-here-title): Rename from
 	`org-overlay-columns-title'.
-	(org-columns-remove-overlays): ` Renamed from
-	org-remove-column-overlays'.
-	(org-columns-get-autowidth-alist): ` Renamed from
-	org-get-columns-autowidth-alist'.
-	(org-columns-display-here): Renamed from `org-overlay-columns'.
-	(org-columns-new-overlay): Renamed from `org-new-column-overlay'.
-	(org-columns-quit): Renamed from `org-column-quit'.
-	(org-columns-show-value): Renamed from `org-column-show-value'.
+	(org-columns-remove-overlays): Rename from org-remove-column-overlays.
+	(org-columns-get-autowidth-alist): Rename from
+	`org-get-columns-autowidth-alist'.
+	(org-columns-display-here): Rename from `org-overlay-columns'.
+	(org-columns-new-overlay): Rename from `org-new-column-overlay'.
+	(org-columns-quit): Rename from `org-column-quit'.
+	(org-columns-show-value): Rename from `org-column-show-value'.
 	(org-columns-content, org-columns-widen)
 	(org-columns-next-allowed-value)
 	(org-columns-edit-allowed, org-columns-store-format)
@@ -34,17 +38,16 @@
 	(org-property-get-allowed-values)
 	(org-verify-version, org-column-string-to-number)
 	(org-delete-property-globally): New functions.
-	(org-columns-current-fmt): Renamed from `org-current-columns-fmt'.
-	(org-columns-overlays): Renamed from `org-column-overlays'.
-	(org-columns-map): Renamed from `org-column-map'.
-	(org-columns-current-maxwidths): Renamed from
+	(org-columns-current-fmt): Rename from `org-current-columns-fmt'.
+	(org-columns-overlays): Rename from `org-column-overlays'.
+	(org-columns-map): Rename from `org-column-map'.
+	(org-columns-current-maxwidths): Rename from
 	`org-current-columns-maxwidths'.
 	(org-columns-begin-marker, org-columns-current-fmt-compiled)
 	(org-previous-header-line-format)
 	(org-columns-inhibit-recalculation)
 	(org-columns-top-level-marker): New variables.
-	(org-columns-default-format): Renamed from
-	`org-default-columns-format'.
+	(org-columns-default-format): Rename from `org-default-columns-format'.
 	(org-property-re): New constant.
 
 2007-07-10  Guanpeng Xu  <[email protected]>
@@ -77,8 +80,8 @@
 
 	* longlines.el (longlines-wrap-region): Avoid marking buffer as
 	modified.
-	(longlines-auto-wrap, longlines-window-change-function): Remove
-	unnecessary calls to set-buffer-modified-p.
+	(longlines-auto-wrap, longlines-window-change-function):
+	Remove unnecessary calls to set-buffer-modified-p.
 
 2007-07-08  Katsumi Yamaoka  <[email protected]>
 
@@ -89,13 +92,6 @@
 	* vc-cvs.el (vc-cvs-revert): Use vc-default-revert.
 	(vc-cvs-checkout): Remove last arg now unused; simplify.
 
-2007-07-08  Chong Yidong  <[email protected]>
-
-	* longlines.el (longlines-wrap-region): Avoid marking buffer as
-	modified.
-	(longlines-auto-wrap, longlines-window-change-function):
-	Remove unnecessary calls to set-buffer-modified-p.
-
 2007-07-08  Michael Albinus  <[email protected]>
 
 	* files.el (file-remote-p): Introduce optional parameter CONNECTED.
diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el
index 30b7c7e193..0fa89f2a17 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)