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

[Andreas Schwab]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Andreas Schwab <schwab> 09/12/17 00:21:51

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

Log message:
        (batch-update-autoloads): Only exclude
        unconditionally preloaded files.

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

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16909
retrieving revision 1.16910
diff -u -b -r1.16909 -r1.16910
--- ChangeLog   16 Dec 2009 09:52:42 -0000      1.16909
+++ ChangeLog   17 Dec 2009 00:21:47 -0000      1.16910
@@ -1,3 +1,8 @@
+2009-12-17  Andreas Schwab  <address@hidden>
+
+       * emacs-lisp/autoload.el (batch-update-autoloads): Only exclude
+       unconditionally preloaded files.
+
 2009-12-16  Juri Linkov  <address@hidden>
 
        Revert to old 23.1 logic of using the file at the mark as default.

Index: emacs-lisp/autoload.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/emacs-lisp/autoload.el,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -b -r1.154 -r1.155
--- emacs-lisp/autoload.el      10 Dec 2009 08:46:57 -0000      1.154
+++ emacs-lisp/autoload.el      17 Dec 2009 00:21:51 -0000      1.155
@@ -723,9 +723,9 @@
                  (forward-line 1))))
          (with-temp-buffer
            (insert-file-contents mfile)
-           (when (re-search-forward "^lisp= " nil t)
+           (when (re-search-forward "^shortlisp= " nil t)
              (setq lim (line-end-position))
-             (while (re-search-forward "\\${lispsource}\\([^ ]+\\.el\\)c?\\>"
+             (while (re-search-forward "\\.\\./lisp/\\([^ ]+\\.el\\)c?\\>"
                                        lim t)
                (push (expand-file-name (match-string 1) ldir)
                      autoload-excludes))))))))