diff options
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/emacs-lisp/autoload.el | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 939d34646ab..7bcd06f8be8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2009-10-07 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * emacs-lisp/autoload.el (batch-update-autoloads): Remove useless use of | ||
| 4 | concat. | ||
| 5 | |||
| 1 | 2009-10-07 Stefan Monnier <monnier@iro.umontreal.ca> | 6 | 2009-10-07 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 7 | ||
| 3 | * files-x.el (read-file-local-variable): Include some | 8 | * files-x.el (read-file-local-variable): Include some |
diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el index 7a0a43631de..56d3e32f996 100644 --- a/lisp/emacs-lisp/autoload.el +++ b/lisp/emacs-lisp/autoload.el | |||
| @@ -693,8 +693,9 @@ Calls `update-directory-autoloads' on the command line arguments." | |||
| 693 | (insert-file-contents mfile) | 693 | (insert-file-contents mfile) |
| 694 | (when (re-search-forward "^lisp= " nil t) | 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}\\([^ ]+\\.el\\)c?\\>" |
| 697 | (push (concat (expand-file-name (match-string 1) ldir) ".el") | 697 | lim t) |
| 698 | (push (expand-file-name (match-string 1) ldir) | ||
| 698 | autoload-excludes))))))) | 699 | autoload-excludes))))))) |
| 699 | (let ((args command-line-args-left)) | 700 | (let ((args command-line-args-left)) |
| 700 | (setq command-line-args-left nil) | 701 | (setq command-line-args-left nil) |