aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2009-08-30 18:17:20 +0000
committerJuanma Barranquero2009-08-30 18:17:20 +0000
commit060c08b5747ab9e4423529ccc011207e83cc2e19 (patch)
tree04e02fbab7737bbe06eca476755eafd4ca28de2b
parent73ebf88f15539765b5cfb628791408845a240637 (diff)
downloademacs-060c08b5747ab9e4423529ccc011207e83cc2e19.tar.gz
emacs-060c08b5747ab9e4423529ccc011207e83cc2e19.zip
* subr.el (do-after-load-evaluation): Fix last change: use `mapc'
instead of `dolist' to avoid a recursive require when bootstrapping.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/subr.el11
2 files changed, 11 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d5c3bc92674..404f228f9b2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12009-08-30 Juanma Barranquero <lekktu@gmail.com>
2
3 * subr.el (do-after-load-evaluation): Fix last change: use `mapc'
4 instead of `dolist' to avoid a recursive require when bootstrapping.
5
12009-08-30 Stefan Monnier <monnier@iro.umontreal.ca> 62009-08-30 Stefan Monnier <monnier@iro.umontreal.ca>
2 7
3 * emacs-lisp/lisp.el (field-complete): Use minibuffer-complete. 8 * emacs-lisp/lisp.el (field-complete): Use minibuffer-complete.
diff --git a/lisp/subr.el b/lisp/subr.el
index 436da221cef..43bce3055b6 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1688,11 +1688,12 @@ This function makes or adds to an entry on `after-load-alist'."
1688(defun do-after-load-evaluation (abs-file) 1688(defun do-after-load-evaluation (abs-file)
1689 "Evaluate all `eval-after-load' forms, if any, for ABS-FILE. 1689 "Evaluate all `eval-after-load' forms, if any, for ABS-FILE.
1690ABS-FILE, a string, should be the absolute true name of a file just loaded." 1690ABS-FILE, a string, should be the absolute true name of a file just loaded."
1691 (dolist (a-l-element after-load-alist) 1691 (mapc #'(lambda (a-l-element)
1692 (when (and (stringp (car a-l-element)) 1692 (when (and (stringp (car a-l-element))
1693 (string-match-p (car a-l-element) abs-file)) 1693 (string-match-p (car a-l-element) abs-file))
1694 ;; discard the file name regexp 1694 ;; discard the file name regexp
1695 (mapc #'eval (cdr a-l-element))))) 1695 (mapc #'eval (cdr a-l-element))))
1696 after-load-alist))
1696 1697
1697(defun eval-next-after-load (file) 1698(defun eval-next-after-load (file)
1698 "Read the following input sexp, and run it whenever FILE is loaded. 1699 "Read the following input sexp, and run it whenever FILE is loaded.