(jka-compr-load): Fix up load-history.

2 files changed, 9 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d63fb8eb261..c7590e8d80b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2000-01-30  Dave Love  <fx@gnu.org>
 
+        * jka-compr.el (jka-compr-load): Fix up load-history.
+
         * emacs-lisp/cl.el: Replace autoloads for dolist, dotimes.
 
         * emacs-lisp/cl-macs.el: Revert previous change.
diff --git a/lisp/jka-compr.el b/lisp/jka-compr.el
index a3fae5b05bc..d18483e7669 100644
--- a/lisp/jka-compr.el
+++ b/lisp/jka-compr.el
@@ -704,9 +704,14 @@ There should be no more than seven characters after the final `/'."
 
           (let ((load-force-doc-strings t))
             (load load-file noerror t t))
-
           (or nomessage
-              (message "Loading %s...done." file)))
+              (message "Loading %s...done." file))
+          ;; Fix up the load history to point at the right library.
+          (let ((l (assoc load-file load-history)))
+            ;; Remove .gz and .elc?.
+            (while (file-name-extension file)
+              (setq file (file-name-sans-extension file)))
+            (setcar l file)))
 
       (jka-compr-delete-temp-file local-copy))