summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeil Jerram <neil@ossau.uklinux.net>2006-02-04 15:57:16 +0000
committerNeil Jerram <neil@ossau.uklinux.net>2006-02-04 15:57:16 +0000
commit2328328f85a5ea317a17b451d98c64c65fb52d6c (patch)
tree55fc5aeb631a16ad1be5d65fb1d7a80b8c7e9643
parent26beee1e746303f49d0f70673fe2327a8fed6bb7 (diff)
downloadguile-2328328f85a5ea317a17b451d98c64c65fb52d6c.tar.gz
* boot-9.scm (try-module-autoload): Make sure that module code is
loaded with the default reader (current-reader #f). Thanks to Ludovic Courtès for pointing this problem out.
-rw-r--r--ice-9/ChangeLog4
-rw-r--r--ice-9/boot-9.scm3
2 files changed, 6 insertions, 1 deletions
diff --git a/ice-9/ChangeLog b/ice-9/ChangeLog
index f50277983..74e941028 100644
--- a/ice-9/ChangeLog
+++ b/ice-9/ChangeLog
@@ -1,5 +1,9 @@
2006-02-04 Neil Jerram <neil@ossau.uklinux.net>
+ * boot-9.scm (try-module-autoload): Make sure that module code is
+ loaded with the default reader (current-reader #f). Thanks to
+ Ludovic Courtès for pointing this problem out.
+
* stack-catch.scm (stack-catch): Use catch pre-unwind handler
instead of lazy-catch.
diff --git a/ice-9/boot-9.scm b/ice-9/boot-9.scm
index 17826a096..7da005c34 100644
--- a/ice-9/boot-9.scm
+++ b/ice-9/boot-9.scm
@@ -2180,7 +2180,8 @@
(load-file load-compiled full)))
((%search-load-path file)
=> (lambda (full)
- (load-file primitive-load full))))))
+ (with-fluids ((current-reader #f))
+ (load-file primitive-load full)))))))
(lambda () (set-autoloaded! dir-hint name didit)))
didit))))