From 3616e0b97099e9b7d6b702f71088f712208a14b5 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Thu, 17 Dec 2009 00:21:47 +0000 Subject: [PATCH] (batch-update-autoloads): Only exclude unconditionally preloaded files. --- lisp/ChangeLog | 5 +++++ lisp/emacs-lisp/autoload.el | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index cd139b72456..24aea22138c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2009-12-17 Andreas Schwab + + * emacs-lisp/autoload.el (batch-update-autoloads): Only exclude + unconditionally preloaded files. + 2009-12-16 Juri Linkov Revert to old 23.1 logic of using the file at the mark as default. diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el index f135f253ce8..d2e276e1917 100644 --- a/lisp/emacs-lisp/autoload.el +++ b/lisp/emacs-lisp/autoload.el @@ -723,9 +723,9 @@ Calls `update-directory-autoloads' on the command line arguments." (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)))))))) -- 2.39.5