[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/lisp/emacs-lisp autoload.el
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] emacs/lisp/emacs-lisp autoload.el |
Date: |
Wed, 07 Oct 2009 07:18:53 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Glenn Morris <gm> 09/10/07 07:18:53
Modified files:
lisp/emacs-lisp: autoload.el
Log message:
(batch-update-autoloads): Rather than having the list of preloaded
files passed on the command-line, get it from src/Makefile.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/emacs-lisp/autoload.el?cvsroot=emacs&r1=1.146&r2=1.147
Patches:
Index: autoload.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/emacs-lisp/autoload.el,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -b -r1.146 -r1.147
--- autoload.el 6 Oct 2009 03:12:32 -0000 1.146
+++ autoload.el 7 Oct 2009 07:18:53 -0000 1.147
@@ -683,18 +683,19 @@
(defun batch-update-autoloads ()
"Update loaddefs.el autoloads in batch mode.
Calls `update-directory-autoloads' on the command line arguments."
- ;; For use during the Emacs build process only. We do the file-name
- ;; expansion here rather than in lisp/Makefile in order to keep the
- ;; shell command line short. (Long lines are an issue on some systems.)
- (if (stringp autoload-excludes)
- (setq autoload-excludes
- (mapcar
- (lambda (file)
- (concat
- (expand-file-name (file-name-sans-extension file)
- (file-name-directory generated-autoload-file))
- ".el"))
- (split-string autoload-excludes))))
+ ;; For use during the Emacs build process only.
+ (unless autoload-excludes
+ (let* ((ldir (file-name-directory generated-autoload-file))
+ (mfile (expand-file-name "../src/Makefile" ldir))
+ lim)
+ (when (file-readable-p mfile)
+ (with-temp-buffer
+ (insert-file-contents mfile)
+ (when (re-search-forward "^lisp= ")
+ (setq lim (line-end-position))
+ (while (re-search-forward "\\${lispsource}\\([^ ]*\\)\\.elc?" lim t)
+ (push (concat (expand-file-name (match-string 1) ldir) ".el")
+ autoload-excludes)))))))
(let ((args command-line-args-left))
(setq command-line-args-left nil)
(apply 'update-directory-autoloads args)))