# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1287718366 25200
# Node ID 8d485e5aa143d9bc9374733c4a5cff9fbf814a3c
# Parent  83d4d82b8493e4a3b64bab8aafbbd069cbaa640d
Small autoloads fix.

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

diff -r 83d4d82b8493 -r 8d485e5aa143 lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Oct 21 20:28:21 2010 -0700
+++ b/lisp/ChangeLog	Thu Oct 21 20:32:46 2010 -0700
@@ -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 -r 83d4d82b8493 -r 8d485e5aa143 lisp/emacs-lisp/autoload.el
--- a/lisp/emacs-lisp/autoload.el	Thu Oct 21 20:28:21 2010 -0700
+++ b/lisp/emacs-lisp/autoload.el	Thu Oct 21 20:32:46 2010 -0700
@@ -778,16 +778,17 @@
 	  (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