From c1f9990551fdca7e970a2dd636222e407dce053f Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Wed, 19 Dec 2001 04:12:03 +0000
Subject: [PATCH] Move SYNTAXER/DEFAULT-ENVIRONMENT into the syntaxer.

---
 v7/src/runtime/global.scm  | 6 +-----
 v7/src/runtime/runtime.pkg | 3 +--
 v7/src/runtime/syntax.scm  | 6 ++----
 v7/src/sf/sf.pkg           | 6 ++++--
 4 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/v7/src/runtime/global.scm b/v7/src/runtime/global.scm
index 2726a1585..a98ebbfa5 100644
--- a/v7/src/runtime/global.scm
+++ b/v7/src/runtime/global.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: global.scm,v 14.55 2001/12/18 18:39:33 cph Exp $
+$Id: global.scm,v 14.56 2001/12/19 04:11:15 cph Exp $
 
 Copyright (c) 1988-2001 Massachusetts Institute of Technology
 
@@ -215,10 +215,6 @@ USA.
 (define default/quit %quit)
 (define hook/quit default/quit)
 
-(define syntaxer/default-environment
-  (*make-environment system-global-environment
-		     (vector lambda-tag:unnamed)))
-
 (define user-initial-environment
   (*make-environment system-global-environment
 		     (vector lambda-tag:unnamed)))
diff --git a/v7/src/runtime/runtime.pkg b/v7/src/runtime/runtime.pkg
index 64bd263bf..06f6e1f34 100644
--- a/v7/src/runtime/runtime.pkg
+++ b/v7/src/runtime/runtime.pkg
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: runtime.pkg,v 14.388 2001/12/19 01:39:36 cph Exp $
+$Id: runtime.pkg,v 14.389 2001/12/19 04:11:02 cph Exp $
 
 Copyright (c) 1988-2001 Massachusetts Institute of Technology
 
@@ -315,7 +315,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 	  set-cell-contents!
 	  set-interrupt-enables!
 	  show-time
-	  syntaxer/default-environment
 	  system-hunk3-cons
 	  system-hunk3-cxr0
 	  system-hunk3-cxr1
diff --git a/v7/src/runtime/syntax.scm b/v7/src/runtime/syntax.scm
index d7c1cb3da..1d87204b7 100644
--- a/v7/src/runtime/syntax.scm
+++ b/v7/src/runtime/syntax.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: syntax.scm,v 14.37 2001/12/19 04:10:18 cph Exp $
+$Id: syntax.scm,v 14.38 2001/12/19 04:12:03 cph Exp $
 
 Copyright (c) 1988-2001 Massachusetts Institute of Technology
 
@@ -480,9 +480,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 (define-integrable (syntax-eval scode)
   (extended-scode-eval scode syntaxer/default-environment))
 
-(define syntaxer/default-environment
-  (*make-environment system-global-environment
-		     (vector lambda-tag:unnamed)))
+(define syntaxer/default-environment)
 
 ;;;; FLUID-LET
 
diff --git a/v7/src/sf/sf.pkg b/v7/src/sf/sf.pkg
index 0c032bedf..fe8bd4b78 100644
--- a/v7/src/sf/sf.pkg
+++ b/v7/src/sf/sf.pkg
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: sf.pkg,v 4.12 2001/12/17 17:40:59 cph Exp $
+$Id: sf.pkg,v 4.13 2001/12/19 04:10:28 cph Exp $
 
 Copyright (c) 1987-1999, 2001 Massachusetts Institute of Technology
 
@@ -117,7 +117,9 @@ USA.
 	  declarations/map
 	  declarations/original
 	  declarations/parse
-	  operations->external))
+	  operations->external)
+  (import (runtime syntaxer)
+	  syntaxer/default-environment))
 
 (define-package (scode-optimizer copy)
   (files "copy")
-- 
2.25.1