Small autoloads fix.

* lisp/emacs-lisp/autoload.el (batch-update-autoloads): Update for
src/Makefile no longer being pre-processed.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4312c06dd050b35c5664f691b3b6da6e6adec69d..04ab7875644cfbb3efc617b1d267a85d23913d2b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-22  Glenn Morris  <rgm@gnu.org>
+
+       * emacs-lisp/autoload.el (batch-update-autoloads): Update for
+       src/Makefile no longer being pre-processed.
+
 2010-10-22  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * emacs-lisp/find-func.el (find-library): Use test-completion.

diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el
index 30c384aff91791c4cd99fcd628b6e5eff3cc07b3..532d68245d87c8dc35e52576727a3f45dbc5ed64 100644 (file)
--- a/lisp/emacs-lisp/autoload.el
+++ b/lisp/emacs-lisp/autoload.el
@@ -778,16 +778,17 @@ Calls `update-directory-autoloads' on the command line arguments."
          (with-temp-buffer
            (insert-file-contents mfile)
            (when (re-search-forward "^shortlisp= " nil t)
-             (setq lim (line-end-position))
-             (while (re-search-forward "\\.\\./lisp/\\([^ ]+\\.el\\)c?\\>"
-                                       lim t)
+             (while (and (not lim)
+                         (re-search-forward "\\.\\./lisp/\\([^ ]+\\.el\\)c?\\>"
+                                            nil t))
                (push (expand-file-name (match-string 1) ldir)
-                     autoload-excludes))))))))
+                     autoload-excludes)
+               (skip-chars-forward " \t")
+               (if (eolp) (setq lim t)))))))))
   (let ((args command-line-args-left))
     (setq command-line-args-left nil)
     (apply 'update-directory-autoloads args)))
 
 (provide 'autoload)
 
-;; arch-tag: 00244766-98f4-4767-bf42-8a22103441c6
 ;;; autoload.el ends here