summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeil Jerram <neil@ossau.uklinux.net>2006-01-13 17:36:52 +0000
committerNeil Jerram <neil@ossau.uklinux.net>2006-01-13 17:36:52 +0000
commit27d64e2b4a082e58338bb99f4e756469d857a70d (patch)
treed2ee8f96fa15e234feb084f2d2450effe0b53723
parentc255614e268247b1f336f0cba3150764119bcf01 (diff)
downloadguile-27d64e2b4a082e58338bb99f4e756469d857a70d.tar.gz
(repl-reader): Use value of current-reader fluid to
do the read, if set. (Thanks to Ludovic Courtès for the patch.)
-rw-r--r--ice-9/ChangeLog5
-rw-r--r--ice-9/boot-9.scm2
2 files changed, 6 insertions, 1 deletions
diff --git a/ice-9/ChangeLog b/ice-9/ChangeLog
index 9d6dd505a..33c7935e3 100644
--- a/ice-9/ChangeLog
+++ b/ice-9/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-13 Neil Jerram <neil@ossau.uklinux.net>
+
+ * boot-9.scm (repl-reader): Use value of current-reader fluid to
+ do the read, if set. (Thanks to Ludovic Courtès for the patch.)
+
2005-12-14 Neil Jerram <neil@ossau.uklinux.net>
* boot-9.scm (load-module): Support an optional custom reader arg,
diff --git a/ice-9/boot-9.scm b/ice-9/boot-9.scm
index 775b8509c..dd8ac4503 100644
--- a/ice-9/boot-9.scm
+++ b/ice-9/boot-9.scm
@@ -2540,7 +2540,7 @@
(display prompt)
(force-output)
(run-hook before-read-hook)
- (read (current-input-port))))
+ ((or (fluid-ref current-reader) read) (current-input-port))))
(define (scm-style-repl)