From: Romain Francoise Date: Sat, 22 Oct 2005 17:34:49 +0000 (+0000) Subject: (eval-after-load): Convert library name to an absolute file name using X-Git-Tag: emacs-pretest-22.0.90~6400 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e8fbc5e02398f6a00c999efc4d66054b94443d24;p=emacs.git (eval-after-load): Convert library name to an absolute file name using locate-library, since load-history no longer has library names in it. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index fed628ba939..4276c2b5363 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,8 +1,14 @@ +2005-10-22 Romain Francoise + + * subr.el (eval-after-load): Convert library name to an absolute + file name using locate-library, since load-history no longer has + library names in it. + 2005-10-22 Richard M. Stallman * files.el (make-temp-file): Moved from subr.el. * subr.el (make-temp-file): Moved to files.el. - + * window.el (get-buffer-window-list): Moved from subr.el. * subr.el (get-buffer-window-list): Moved to window.el. diff --git a/lisp/subr.el b/lisp/subr.el index 5c662e9524d..04b36897f39 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -1350,7 +1350,8 @@ evaluated whenever that feature is `provide'd." ;; Make sure `load-history' contains the files dumped with ;; Emacs for the case that FILE is one of them. ;; (load-symbol-file-load-history) - (assoc file load-history)) + (when (locate-library file) + (assoc (locate-library file) load-history))) (eval form)))) form)