Commit 6a801864 authored by Eli Zaretskii's avatar Eli Zaretskii
Browse files

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.
parent 2aff7c53
2010-01-22 Eli Zaretskii <eliz@gnu.org>
* 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 <acm@muc.de>
Fix a situation where deletion of a cpp construct throws an error.
......
......@@ -590,7 +590,14 @@ There should be no more than seven characters after the final `/'."
(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)))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment