* subr.el (do-after-load-evaluation): Fix last change: use `mapc'

  instead of `dolist' to avoid a recursive require when bootstrapping.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d5c3bc92674dcf4843eff945b5f6dd2c52efebdc..404f228f9b22a7b20a782a737aef59b24ca29b54 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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.

diff --git a/lisp/subr.el b/lisp/subr.el
index 436da221cefbe9f16a713e94032947519a44454a..43bce3055b6ecbbf566054057a59548a343c90d3 100644 (file)
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1688,11 +1688,12 @@ This function makes or adds to an entry on `after-load-alist'."
 (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.