From 9cba50dbd3ec79ed49f66f07562910cce982ad3f Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Fri, 5 Jul 1991 23:15:23 +0000
Subject: [PATCH] Change evaluation commands to correctly bind current and repl
 output ports to capture all output.  Do this regardless of the value of
 `enable-transcript-buffer'.  Also change the evaluation commands to use
 `hook/repl-eval' just like repls and `load'.

---
 v7/src/edwin/evlcom.scm | 42 ++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/v7/src/edwin/evlcom.scm b/v7/src/edwin/evlcom.scm
index ce2f48d56..42612db09 100644
--- a/v7/src/edwin/evlcom.scm
+++ b/v7/src/edwin/evlcom.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;;	$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/evlcom.scm,v 1.24 1991/05/18 03:08:17 cph Exp $
+;;;	$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/evlcom.scm,v 1.25 1991/07/05 23:15:23 cph Exp $
 ;;;
 ;;;	Copyright (c) 1986, 1989-91 Massachusetts Institute of Technology
 ;;;
@@ -312,16 +312,11 @@ may be available.  The following commands are special to this mode:
        value))))
 
 (define (eval-with-history expression environment)
-  (scode-eval-with-history (syntax expression
-				   (evaluation-syntax-table environment))
-			   environment))
-
-(define (scode-eval-with-history scode environment)
-  (bind-condition-handler (list condition-type:error) evaluation-error-handler
-    (lambda ()
-      (with-new-history
-       (lambda ()
-	 (extended-scode-eval scode environment))))))
+  (let ((syntax-table (evaluation-syntax-table environment)))
+    (bind-condition-handler (list condition-type:error)
+	evaluation-error-handler
+      (lambda ()
+	(hook/repl-eval (nearest-repl) expression environment syntax-table)))))
 
 (define (evaluation-error-handler condition)
   (if (ref-variable debug-on-evaluation-error)
@@ -348,22 +343,27 @@ may be available.  The following commands are special to this mode:
 	    (let ((output-port
 		   (let ((buffer (transcript-buffer)))
 		     (mark->output-port (buffer-end buffer) buffer))))
-	      (with-output-to-port output-port
-		(lambda ()
-		  (with-cmdl/output-port (nearest-cmdl)
-		    (lambda ()
-		      (fresh-lines 1)
-		      (thunk))))))))
+	      (fresh-lines 1 output-port)
+	      (with-standard-output-port output-port thunk))))
       (let ((value))
 	(let ((output
-	       (with-output-to-string
-		 (lambda ()
-		   (set! value (thunk))
-		   unspecific))))
+	       (with-string-output-port
+		(lambda (output-port)
+		  (with-standard-output-port output-port
+		    (lambda ()
+		      (set! value (thunk))
+		      unspecific))))))
 	  (if (not (string-null? output))
 	      (string->temporary-buffer output "*Unsolicited-Output*")))
 	value)))
 
+(define (with-standard-output-port output-port thunk)
+  (with-output-to-port output-port
+    (lambda ()
+      (with-cmdl/output-port (nearest-cmdl) output-port
+	(lambda ()
+	  (thunk))))))
+
 (define (transcript-write value)
   (let ((value-string
 	 (if (undefined-value? value)
-- 
2.25.1