aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Moellmann2001-01-11 14:24:02 +0000
committerGerd Moellmann2001-01-11 14:24:02 +0000
commit422717d17bf62d24e977ce728fe9d50abaa96a13 (patch)
tree1d66658c48a8564770818229a9dccbec4894315c
parent2c2ff7f28872678cc72bf317a919e5a96a135aa4 (diff)
downloademacs-422717d17bf62d24e977ce728fe9d50abaa96a13.tar.gz
emacs-422717d17bf62d24e977ce728fe9d50abaa96a13.zip
(eval-after-load): Call load-symbol-file-load-history to
ensure that eval-after-load works for files dumped with Emacs.
-rw-r--r--lisp/ChangeLog7
-rw-r--r--lisp/subr.el3
2 files changed, 10 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2c5f67361ba..f4e7912766e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,12 @@
12001-01-11 Gerd Moellmann <gerd@gnu.org> 12001-01-11 Gerd Moellmann <gerd@gnu.org>
2 2
3 * subr.el (eval-after-load): Call load-symbol-file-load-history to
4 ensure that eval-after-load works for files dumped with Emacs.
5
6 * help.el (load-symbol-file-load-history): New function extracted
7 from function symbol-file.
8 (symbol-file): Use it.
9
3 * toolbar/save.xpm, toolbar/undo.xpm: Use the same colors as 10 * toolbar/save.xpm, toolbar/undo.xpm: Use the same colors as
4 exit.xpm. 11 exit.xpm.
5 12
diff --git a/lisp/subr.el b/lisp/subr.el
index 2dc159a3424..3a60e15b0e5 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -804,6 +804,9 @@ It does nothing if FORM is already on the list for FILE.
804FILE must match exactly. Normally FILE is the name of a library, 804FILE must match exactly. Normally FILE is the name of a library,
805with no directory or extension specified, since that is how `load' 805with no directory or extension specified, since that is how `load'
806is normally called." 806is normally called."
807 ;; Make sure `load-history' contains the files dumped with Emacs
808 ;; for the case that FILE is one of the files dumped with Emacs.
809 (load-symbol-file-load-history)
807 ;; Make sure there is an element for FILE. 810 ;; Make sure there is an element for FILE.
808 (or (assoc file after-load-alist) 811 (or (assoc file after-load-alist)
809 (setq after-load-alist (cons (list file) after-load-alist))) 812 (setq after-load-alist (cons (list file) after-load-alist)))