From 410eaca7a6ed7565bdacc92e411fa20627da08e7 Mon Sep 17 00:00:00 2001
From: Jose Antonio Ortega Ruiz <jao@gnu.org>
Date: Fri, 1 May 2009 23:10:53 +0200
Subject: PLT:  Current module in REPL prompt and don't change it after C-cC-l.

---
 scheme/plt/geiser.ss | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

(limited to 'scheme/plt/geiser.ss')

diff --git a/scheme/plt/geiser.ss b/scheme/plt/geiser.ss
index 9f99641..dd6b7c3 100644
--- a/scheme/plt/geiser.ss
+++ b/scheme/plt/geiser.ss
@@ -35,9 +35,7 @@
            geiser/make-repl-reader)
 
   (compile-enforce-module-constants #f)
-  (require (lib "geiser/eval")
-           (lib "geiser/completions")
-           (lib "geiser/locations"))
+  (require geiser/eval geiser/completions geiser/locations)
 
   (define geiser/eval eval-in)
   (define geiser/compile compile-in)
@@ -47,20 +45,14 @@
   (define geiser/completions completions)
   (define geiser/symbol-location symbol-location)
 
-  (define prompt (make-parameter "mzscheme@(geiser)"))
-  (define (geiser/make-repl-reader builtin-reader)
-    (lambda ()
-      (display (prompt))
-      (builtin-reader))))
+  (define (geiser/make-repl-reader)
+    (compose (make-repl-reader (current-prompt-read)) current-namespace)))
 
 (require scheme/help)
 (require 'geiser)
 
 (current-prompt-read
- (let ([old (current-prompt-read)])
-   (lambda ()
-     (current-prompt-read
-      ((dynamic-require ''geiser 'geiser/make-repl-reader) old)))))
+ ((dynamic-require ''geiser 'geiser/make-repl-reader)))
 
 
 ;;; geiser.ss ends here
-- 
cgit v1.2.3