(eval-after-load): Convert library name to an absolute file name using

locate-library, since load-history no longer has library names in it.

2 files changed, 9 insertions, 2 deletions

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  <romain@orebokech.com>
+
+        * 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  <rms@gnu.org>
 
         * 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)