[Emacs-diffs] emacs/lisp ChangeLog subr.el

[Juanma Barranquero]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Juanma Barranquero <lektu>      09/08/29 22:27:23

Modified files:
        lisp           : ChangeLog subr.el 

Log message:
        * subr.el (do-after-load-evaluation): Simplify.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16051&r2=1.16052
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/subr.el?cvsroot=emacs&r1=1.646&r2=1.647

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16051
retrieving revision 1.16052
diff -u -b -r1.16051 -r1.16052
--- ChangeLog   29 Aug 2009 19:22:39 -0000      1.16051
+++ ChangeLog   29 Aug 2009 22:27:19 -0000      1.16052
@@ -1,3 +1,7 @@
+2009-08-29  Juanma Barranquero  <address@hidden>
+
+       * subr.el (do-after-load-evaluation): Simplify.
+
 2009-08-29  Dan Nicolaescu  <address@hidden>
 
        * vc.el (vc-print-log-internal): Move RCS/CVS specific code ...

Index: subr.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/subr.el,v
retrieving revision 1.646
retrieving revision 1.647
diff -u -b -r1.646 -r1.647
--- subr.el     27 Aug 2009 04:24:08 -0000      1.646
+++ subr.el     29 Aug 2009 22:27:23 -0000      1.647
@@ -1688,16 +1688,11 @@
 (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."
-  (let ((after-load-elts after-load-alist)
-       a-l-element file-elements file-element form)
-    (while after-load-elts
-      (setq a-l-element (car after-load-elts)
-           after-load-elts (cdr after-load-elts))
+  (dolist (a-l-element after-load-alist)
       (when (and (stringp (car a-l-element))
-                (string-match (car a-l-element) abs-file))
-       (while (setq a-l-element (cdr a-l-element)) ; discard the file name
-         (setq form (car a-l-element))
-         (eval form))))))
+              (string-match-p (car a-l-element) abs-file))
+      ;; discard the file name regexp
+      (mapc #'eval (cdr a-l-element)))))
 
 (defun eval-next-after-load (file)
   "Read the following input sexp, and run it whenever FILE is loaded.