From: Guillermo J. Rozas <edu/mit/csail/zurich/gjr>
Date: Wed, 21 Jan 1987 21:45:11 +0000 (+0000)
Subject: Merge with BBN
X-Git-Tag: 20090517-FFI~13738
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=8af03fe4a836386944fb4649f374f6f4c9e6eb0d;p=mit-scheme.git

Merge with BBN
---

diff --git a/v7/src/runtime/debug.scm b/v7/src/runtime/debug.scm
index 355d2278c..a8ff6b61f 100644
--- a/v7/src/runtime/debug.scm
+++ b/v7/src/runtime/debug.scm
@@ -37,7 +37,7 @@
 
 ;;;; Debugger
 
-;;; $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/debug.scm,v 1.84 1987/01/15 02:55:47 cph Exp $
+;;; $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/debug.scm,v 13.40 1987/01/21 21:37:09 jinx Exp $
 
 (in-package debugger-package
 (declare (usual-integrations))
diff --git a/v7/src/runtime/equals.scm b/v7/src/runtime/equals.scm
index 79029e8ff..e305ae21a 100644
--- a/v7/src/runtime/equals.scm
+++ b/v7/src/runtime/equals.scm
@@ -37,7 +37,7 @@
 
 ;;;; Equality
 
-;;; $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/equals.scm,v 1.10 1986/12/16 19:36:12 cph Exp $
+;;; $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/equals.scm,v 13.40 1987/01/21 21:37:25 jinx Exp $
 
 (declare (usual-integrations))
 
diff --git a/v7/src/runtime/gc.scm b/v7/src/runtime/gc.scm
index a51071ea7..4b8ffce1e 100644
--- a/v7/src/runtime/gc.scm
+++ b/v7/src/runtime/gc.scm
@@ -37,7 +37,7 @@
 
 ;;;; Garbage Collector
 
-;;; $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/gc.scm,v 1.92 1987/01/05 17:25:05 cph Exp $
+;;; $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/gc.scm,v 13.40 1987/01/21 21:38:21 jinx Exp $
 
 (declare (usual-integrations)
 	 (compilable-primitive-functions
diff --git a/v7/src/runtime/list.scm b/v7/src/runtime/list.scm
index 23475858c..0c3c4136f 100644
--- a/v7/src/runtime/list.scm
+++ b/v7/src/runtime/list.scm
@@ -37,7 +37,7 @@
 
 ;;;; List Operations
 
-;;; $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/list.scm,v 1.64 1986/12/16 19:36:45 cph Exp $
+;;; $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/list.scm,v 13.40 1987/01/21 21:39:50 jinx Exp $
 
 (declare (usual-integrations))
 
diff --git a/v7/src/runtime/numpar.scm b/v7/src/runtime/numpar.scm
index 43471e17b..6fdc80873 100644
--- a/v7/src/runtime/numpar.scm
+++ b/v7/src/runtime/numpar.scm
@@ -37,7 +37,7 @@
 
 ;;;; Number Parser
 
-;;; $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/numpar.scm,v 1.6 1987/01/08 22:39:48 cph Exp $
+;;; $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/numpar.scm,v 13.40 1987/01/21 21:40:27 jinx Exp $
 
 (declare (usual-integrations))
 
diff --git a/v7/src/runtime/output.scm b/v7/src/runtime/output.scm
index 5a701e147..7f714c717 100644
--- a/v7/src/runtime/output.scm
+++ b/v7/src/runtime/output.scm
@@ -37,7 +37,7 @@
 
 ;;;; Output
 
-;;; $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/output.scm,v 1.33 1986/12/20 01:26:33 cph Exp $
+;;; $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/output.scm,v 13.40 1987/01/21 21:40:41 jinx Exp $
 
 (declare (usual-integrations))
 
diff --git a/v7/src/runtime/rep.scm b/v7/src/runtime/rep.scm
index 78d6506df..d7343faa0 100644
--- a/v7/src/runtime/rep.scm
+++ b/v7/src/runtime/rep.scm
@@ -99,12 +99,14 @@
     (set! current-state (driver current-state))
     (loop))
 
-  (push-command-hook startup-hook driver initial-state
-   (lambda (startup-hook driver initial-state each-time)
-     (fluid-let ((current-level (1+ current-level))
-		 (previous-driver-hook nearest-driver-hook)
-		 (nearest-driver-hook)
-		 (current-state initial-state))
+  (fluid-let ((current-level (1+ current-level))
+	      (previous-driver-hook nearest-driver-hook)
+	      (nearest-driver-hook)
+	      (current-state))
+    (push-command-hook
+     startup-hook driver initial-state
+     (lambda (startup-hook driver initial-state each-time)
+       (set! current-state initial-state)
        (restart startup-hook each-time))))))
 
 (set! with-rep-continuation
@@ -323,4 +325,5 @@
 (set! printer-history
       (history-reader rep-state-printer-history 'PRINTER-HISTORY))
 
+)
 )
\ No newline at end of file
diff --git a/v7/src/runtime/unpars.scm b/v7/src/runtime/unpars.scm
index 95acc7865..227beb7aa 100644
--- a/v7/src/runtime/unpars.scm
+++ b/v7/src/runtime/unpars.scm
@@ -63,7 +63,7 @@
 	      (*unparse-string (access :write-string port))
 	      (*unparser-list-depth* 0)
 	      (*slashify* slashify))
-    (*unparse-object object)))
+    (*unparse-object-or-future object)))
 
 (define (*unparse-object-or-future object)
   (if (future? object)
@@ -297,4 +297,5 @@
 (define-type 'COMPLEX unparse-number)
 
 ;;; end UNPARSER-PACKAGE.
+))
 ))
\ No newline at end of file