From 69b55131535a1e35952ab5c1d35695c68814ae61 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 21 Oct 2010 20:32:46 -0700 Subject: [PATCH] Small autoloads fix. * lisp/emacs-lisp/autoload.el (batch-update-autoloads): Update for src/Makefile no longer being pre-processed. --- lisp/ChangeLog | 5 +++++ lisp/emacs-lisp/autoload.el | 11 ++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4312c06dd05..04ab7875644 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2010-10-22 Glenn Morris + + * emacs-lisp/autoload.el (batch-update-autoloads): Update for + src/Makefile no longer being pre-processed. + 2010-10-22 Stefan Monnier * 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 30c384aff91..532d68245d8 100644 --- 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 -- 2.39.5