aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2009-10-07 09:58:54 +0000
committerEli Zaretskii2009-10-07 09:58:54 +0000
commit11be40a6f4fa5b1fc128349c3061e62d33020fba (patch)
treeb147ecfc335675d35afc2750b1d0109ff34b141d
parent8c4afe20dfec48f260319c2cb0919c511a14920f (diff)
downloademacs-11be40a6f4fa5b1fc128349c3061e62d33020fba.tar.gz
emacs-11be40a6f4fa5b1fc128349c3061e62d33020fba.zip
(batch-update-autoloads): Fix last change to not error out of search
for "^lisp=" fails.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/emacs-lisp/autoload.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cf0fab71488..445aa4ad7d7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12009-10-07 Eli Zaretskii <eliz@gnu.org>
2
3 * emacs-lisp/autoload.el (batch-update-autoloads): Fix last change
4 to not error out of search for "^lisp=" fails.
5
12009-10-07 Juanma Barranquero <lekktu@gmail.com> 62009-10-07 Juanma Barranquero <lekktu@gmail.com>
2 7
3 * makefile.w32-in (WINS_UPDATES): New macro. 8 * makefile.w32-in (WINS_UPDATES): New macro.
diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el
index 593cdb68284..7a0a43631de 100644
--- a/lisp/emacs-lisp/autoload.el
+++ b/lisp/emacs-lisp/autoload.el
@@ -691,7 +691,7 @@ Calls `update-directory-autoloads' on the command line arguments."
691 (when (file-readable-p mfile) 691 (when (file-readable-p mfile)
692 (with-temp-buffer 692 (with-temp-buffer
693 (insert-file-contents mfile) 693 (insert-file-contents mfile)
694 (when (re-search-forward "^lisp= ") 694 (when (re-search-forward "^lisp= " nil t)
695 (setq lim (line-end-position)) 695 (setq lim (line-end-position))
696 (while (re-search-forward "\\${lispsource}\\([^ ]*\\)\\.elc?" lim t) 696 (while (re-search-forward "\\${lispsource}\\([^ ]*\\)\\.elc?" lim t)
697 (push (concat (expand-file-name (match-string 1) ldir) ".el") 697 (push (concat (expand-file-name (match-string 1) ldir) ".el")