Merge remote-tracking branch 'origin/stable-2.0'

[bpt/guile.git] / module / language / scheme / spec.scm

diff --git a/module/language/scheme/spec.scm b/module/language/scheme/spec.scm
index 6cfbc42..e4cf55c 100644 (file)
--- a/module/language/scheme/spec.scm
+++ b/module/language/scheme/spec.scm
@@ -1,6 +1,6 @@
 ;;; Guile Scheme specification
 
-;; Copyright (C) 2001, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
 
 ;;;; This library is free software; you can redistribute it and/or
 ;;;; modify it under the terms of the GNU Lesser General Public
@@ -25,19 +25,12 @@
   #:use-module (language scheme decompile-tree-il)
   #:export (scheme))
 
-;;;
-;;; Reader
-;;;
-
-(read-enable 'positions)
-
 ;;;
 ;;; Language definition
 ;;;
 
 (define-language scheme
-  #:title      "Guile Scheme"
-  #:version    "0.5"
+  #:title      "Scheme"
   #:reader      (lambda (port env)
                   ;; Use the binding of current-reader from the environment.
                   ;; FIXME: Handle `read-options' as well?
@@ -60,4 +53,11 @@
                     ;; compile-time changes to `current-reader' are
                     ;; limited to the current compilation unit.
                     (module-define! m 'current-reader (make-fluid))
+
+                    ;; Default to `simple-format', as is the case until
+                    ;; (ice-9 format) is loaded.  This allows
+                    ;; compile-time warnings to be emitted when using
+                    ;; unsupported options.
+                    (module-set! m 'format simple-format)
+
                     m)))