changeset 106602:2a684c6f926c

(batch-update-autoloads): Only exclude unconditionally preloaded files.
author Andreas Schwab <schwab@linux-m68k.org>
date Thu, 17 Dec 2009 00:21:47 +0000
parents 5c030ace94f7
children 90cf0c548f89
files lisp/ChangeLog lisp/emacs-lisp/autoload.el
diffstat 2 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Thu Dec 17 00:03:51 2009 +0000
+++ b/lisp/ChangeLog	Thu Dec 17 00:21:47 2009 +0000
@@ -1,3 +1,8 @@
+2009-12-17  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* emacs-lisp/autoload.el (batch-update-autoloads): Only exclude
+	unconditionally preloaded files.
+
 2009-12-16  Juri Linkov  <juri@jurta.org>
 
 	Revert to old 23.1 logic of using the file at the mark as default.
--- a/lisp/emacs-lisp/autoload.el	Thu Dec 17 00:03:51 2009 +0000
+++ b/lisp/emacs-lisp/autoload.el	Thu Dec 17 00:21:47 2009 +0000
@@ -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))))))))