[Emacs-diffs] emacs/lisp ChangeLog emacs-lisp/autoload.el

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        09/12/10 08:46:57

Modified files:
        lisp           : ChangeLog 
        lisp/emacs-lisp: autoload.el 

Log message:
        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.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16879&r2=1.16880
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/emacs-lisp/autoload.el?cvsroot=emacs&r1=1.153&r2=1.154

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16879
retrieving revision 1.16880
diff -u -b -r1.16879 -r1.16880
--- ChangeLog   10 Dec 2009 08:25:58 -0000      1.16879
+++ ChangeLog   10 Dec 2009 08:46:54 -0000      1.16880
@@ -1,3 +1,12 @@
+2009-12-10  Stefan Monnier  <address@hidden>
+
+       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  <address@hidden>
 
        * mail/feedmail.el (top-level): Move require 'mail-utils to start.

Index: emacs-lisp/autoload.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/emacs-lisp/autoload.el,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -b -r1.153 -r1.154
--- emacs-lisp/autoload.el      6 Nov 2009 19:12:58 -0000       1.153
+++ emacs-lisp/autoload.el      10 Dec 2009 08:46:57 -0000      1.154
@@ -372,8 +372,6 @@
           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 @@
           (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 @@
                  ((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 @@
            (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.