[Emacs-diffs] /srv/bzr/emacs/trunk r99392: Fix bug #5447, whereby loading C:/foo.el.gz on MS-Windows would fail.

[Eli Zaretskii]

------------------------------------------------------------
revno: 99392
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Fri 2010-01-22 12:23:25 +0200
message:
  Fix bug #5447, whereby loading C:/foo.el.gz on MS-Windows would fail.
  
   jka-compr.el (jka-compr-load): If load-file is not in load-history, 
   try its file-truename version.
modified:
  lisp/ChangeLog
  lisp/jka-compr.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-01-21 21:45:01 +0000
+++ b/lisp/ChangeLog    2010-01-22 10:23:25 +0000
@@ -1,3 +1,8 @@
+2010-01-22  Eli Zaretskii  <address@hidden>
+
+       * jka-compr.el (jka-compr-load): If load-file is not in
+       load-history, try its file-truename version.  (bug#5447)
+
 2010-01-21  Alan Mackenzie  <address@hidden>
 
        Fix a situation where deletion of a cpp construct throws an error.

=== modified file 'lisp/jka-compr.el'
--- a/lisp/jka-compr.el 2010-01-13 08:35:10 +0000
+++ b/lisp/jka-compr.el 2010-01-22 10:23:25 +0000
@@ -590,7 +590,14 @@
          (or nomessage
              (message "Loading %s...done." file))
          ;; Fix up the load history to point at the right library.
-         (let ((l (assoc load-file load-history)))
+         (let ((l (or (assoc load-file load-history)
+                      ;; On MS-Windows, if load-file is in
+                      ;; temporary-file-directory, it will look like
+                      ;; "c:/DOCUME~1/USER/LOCALS~1/foo", whereas
+                      ;; readevalloop will record its truename in
+                      ;; load-history.  Therefore try truename if the
+                      ;; original name is not in load-history.
+                      (assoc (file-truename load-file) load-history))))
            ;; Remove .gz and .elc?.
            (while (file-name-extension file)
              (setq file (file-name-sans-extension file)))