Mercurial > emacs
changeset 104737:8224438aa3cd
* subr.el (do-after-load-evaluation): Fix last change: use `mapc'
instead of `dolist' to avoid a recursive require when bootstrapping.
| author | Juanma Barranquero <lekktu@gmail.com> |
|---|---|
| date | Sun, 30 Aug 2009 18:17:20 +0000 |
| parents | cc62eac5991f |
| children | 16738af2eddd |
| files | lisp/ChangeLog lisp/subr.el |
| diffstat | 2 files changed, 11 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sun Aug 30 15:13:35 2009 +0000 +++ b/lisp/ChangeLog Sun Aug 30 18:17:20 2009 +0000 @@ -1,3 +1,8 @@ +2009-08-30 Juanma Barranquero <lekktu@gmail.com> + + * subr.el (do-after-load-evaluation): Fix last change: use `mapc' + instead of `dolist' to avoid a recursive require when bootstrapping. + 2009-08-30 Stefan Monnier <monnier@iro.umontreal.ca> * emacs-lisp/lisp.el (field-complete): Use minibuffer-complete.
--- a/lisp/subr.el Sun Aug 30 15:13:35 2009 +0000 +++ b/lisp/subr.el Sun Aug 30 18:17:20 2009 +0000 @@ -1688,11 +1688,12 @@ (defun do-after-load-evaluation (abs-file) "Evaluate all `eval-after-load' forms, if any, for ABS-FILE. ABS-FILE, a string, should be the absolute true name of a file just loaded." - (dolist (a-l-element after-load-alist) - (when (and (stringp (car a-l-element)) - (string-match-p (car a-l-element) abs-file)) - ;; discard the file name regexp - (mapc #'eval (cdr a-l-element))))) + (mapc #'(lambda (a-l-element) + (when (and (stringp (car a-l-element)) + (string-match-p (car a-l-element) abs-file)) + ;; discard the file name regexp + (mapc #'eval (cdr a-l-element)))) + after-load-alist)) (defun eval-next-after-load (file) "Read the following input sexp, and run it whenever FILE is loaded.