From f5a7cc108021208cd9b90ec4258ff2dfd36f7832 Mon Sep 17 00:00:00 2001
From: Jose Antonio Ortega Ruiz <jao@gnu.org>
Date: Fri, 15 May 2009 00:47:05 +0200
Subject: PLT: Initialization fixes and cleanups.
* Check for required minimum version (4.1.5.5).
* Colons instead of dashes in exported identifiers.
* Unneeded requires are gone.
* All significant code inside the geiser module.
---
README | 2 +-
elisp/geiser-plt.el | 2 +-
scheme/plt/geiser.ss | 56 ++++++++++++++++++++++++++--------------------------
3 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/README b/README
index 4ffa2a1..bd36156 100644
--- a/README
+++ b/README
@@ -50,7 +50,7 @@
- Guile works only with the development, vm-based binary. Be sure
to customize `geiser-repl-guile-binary' to point to a correct vm
binary.
- - PLT Scheme 4.1.5.5 and up is recommended. Listing of
+ - PLT Scheme 4.1.5.5 or better required. Listing of
callers/callees is not available.
* Quick key reference
diff --git a/elisp/geiser-plt.el b/elisp/geiser-plt.el
index e0400ec..1db0ec9 100644
--- a/elisp/geiser-plt.el
+++ b/elisp/geiser-plt.el
@@ -82,7 +82,7 @@ This function uses `geiser-plt-init-file' if it exists."
;;; Evaluation support:
(defun geiser-plt-geiser-procedure (proc)
- (let ((proc (intern (format "geiser/%s" proc))))
+ (let ((proc (intern (format "geiser:%s" proc))))
`(dynamic-require ''geiser ',proc)))
(defconst geiser-plt--module-re
diff --git a/scheme/plt/geiser.ss b/scheme/plt/geiser.ss
index e619919..2f9403e 100644
--- a/scheme/plt/geiser.ss
+++ b/scheme/plt/geiser.ss
@@ -24,18 +24,23 @@
;;; Code:
+(require version/utils)
+(unless (version<=? "4.1.5.5" (version))
+ (error 'geiser
+ "Mzscheme version 4.1.5.5 or better required (found ~a)"
+ (version)))
+
(module geiser scheme
- (provide geiser/eval
- geiser/compile
- geiser/load-file
- geiser/compile-file
- geiser/macroexpand
- geiser/completions
- geiser/module-completions
- geiser/symbol-location
- geiser/module-location
- geiser/autodoc
- geiser/make-repl-reader)
+ (provide geiser:eval
+ geiser:compile
+ geiser:load-file
+ geiser:compile-file
+ geiser:macroexpand
+ geiser:completions
+ geiser:module-completions
+ geiser:symbol-location
+ geiser:module-location
+ geiser:autodoc)
(compile-enforce-module-constants #f)
(require geiser/eval
@@ -44,25 +49,20 @@
geiser/locations
geiser/autodoc)
- (define geiser/eval eval-in)
- (define geiser/compile compile-in)
- (define geiser/load-file load-file)
- (define geiser/compile-file compile-file)
- (define geiser/autodoc autodoc)
- (define geiser/completions symbol-completions)
- (define geiser/module-completions module-completions)
- (define geiser/symbol-location symbol-location)
- (define geiser/module-location module-location)
- (define geiser/macroexpand macroexpand)
+ (define geiser:eval eval-in)
+ (define geiser:compile compile-in)
+ (define geiser:load-file load-file)
+ (define geiser:compile-file compile-file)
+ (define geiser:autodoc autodoc)
+ (define geiser:completions symbol-completions)
+ (define geiser:module-completions module-completions)
+ (define geiser:symbol-location symbol-location)
+ (define geiser:module-location module-location)
+ (define geiser:macroexpand macroexpand)
- (define (geiser/make-repl-reader)
- (compose (make-repl-reader (current-prompt-read)) current-namespace)))
+ (current-prompt-read (compose (make-repl-reader (current-prompt-read))
+ current-namespace)))
-(require scheme/help)
(require 'geiser)
-(current-prompt-read
- ((dynamic-require ''geiser 'geiser/make-repl-reader)))
-
-
;;; geiser.ss ends here
--
cgit v1.2.3