# HG changeset patch
# User Romain Francoise <romain@orebokech.com>
# Date 1130002489 0
# Node ID 167ad3f64775664bb266a6d7d41f228b653d53ec
# Parent  2cf0575a01cbd7351e091ad5326468f026818a0a
(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 -r 2cf0575a01cb -r 167ad3f64775 lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Oct 22 16:41:55 2005 +0000
+++ b/lisp/ChangeLog	Sat Oct 22 17:34:49 2005 +0000
@@ -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 -r 2cf0575a01cb -r 167ad3f64775 lisp/subr.el
--- a/lisp/subr.el	Sat Oct 22 16:41:55 2005 +0000
+++ b/lisp/subr.el	Sat Oct 22 17:34:49 2005 +0000
@@ -1350,7 +1350,8 @@
 	    ;; 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)