# HG changeset patch # User Juanma Barranquero # Date 1251656240 0 # Node ID 8224438aa3cd3169e53946ba0076dff731170b65 # Parent cc62eac5991f8609cf7bfd8f08038d0006561082 * subr.el (do-after-load-evaluation): Fix last change: use `mapc' instead of `dolist' to avoid a recursive require when bootstrapping. diff -r cc62eac5991f -r 8224438aa3cd lisp/ChangeLog --- 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 + + * 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 * emacs-lisp/lisp.el (field-complete): Use minibuffer-complete. diff -r cc62eac5991f -r 8224438aa3cd lisp/subr.el --- 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.