From 206f0a2c4f6d3099f716a96181b406922cc6745c Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Mon, 10 May 2004 22:54:09 +0000
Subject: [PATCH] .

original commit: 129e2b2fddb36c4a408af6327233ca9fd3fa0d36
---
 collects/mred/mred.ss | 54 +++++++++++++++++++++++--------------------
 1 file changed, 29 insertions(+), 25 deletions(-)

diff --git a/collects/mred/mred.ss b/collects/mred/mred.ss
index 4c70012a..99b50e34 100644
--- a/collects/mred/mred.ss
+++ b/collects/mred/mred.ss
@@ -64,6 +64,7 @@
        ((error-value->string-handler) s n)))))
 
 (define old-paramz #f)
+(define old-break-paramz #f)
 
 (define (as-entry f)
   (cond
@@ -77,16 +78,17 @@
 	     (set! monitor-owner (current-thread)))
 	   (lambda () 
 	     (set! old-paramz (current-parameterization))
-	     (parameterize ([break-enabled #f]
-			    [error-value->string-handler entered-err-string-handler]
+	     (set! old-break-paramz (current-break-parameterization))
+	     (parameterize ([error-value->string-handler entered-err-string-handler]
 			    [current-exception-handler
 			     (lambda (exn)
 			       ;; Get out of atomic region before letting
 			       ;;  an exception handler work
 			       (k (lambda () (raise exn))))])
-	       (call-with-values 
-		   f 
-		 (lambda args (lambda () (apply values args))))))
+	       (parameterize-break #f
+		 (call-with-values 
+		     f 
+		   (lambda args (lambda () (apply values args)))))))
 	   (lambda ()
 	     (set! monitor-owner #f)
 	     (semaphore-post monitor-sema)
@@ -99,15 +101,18 @@
   (call-with-parameterization
    old-paramz
    (lambda ()
-     (dynamic-wind
-	 (lambda ()
-	   (set! monitor-owner #f)	 
-	   (semaphore-post monitor-sema)
-	   (wx:in-atomic-region #f))
-	 f
-	 (lambda ()
-	   (wx:in-atomic-region monitor-sema)
-	   (set! monitor-owner (current-thread)))))))
+     (call-with-break-parameterization
+      old-break-paramz
+      (lambda ()
+	(dynamic-wind
+	    (lambda ()
+	      (set! monitor-owner #f)	 
+	      (semaphore-post monitor-sema)
+	      (wx:in-atomic-region #f))
+	    f
+	    (lambda ()
+	      (wx:in-atomic-region monitor-sema)
+	      (set! monitor-owner (current-thread)))))))))
 
 (define-syntax entry-point 
   (lambda (stx)
@@ -5977,7 +5982,7 @@
       (make-output-port
        'console
        always-evt
-       (lambda (s start end flush?) 
+       (lambda (s start end flush? breakable?) 
 	 (queue-output (lambda () 
 			 ;; s might end in the middle of a UTF-8 encoding.
 			 ;;  Get a complete prefix, and save the rest.
@@ -7606,16 +7611,15 @@
 			    (lambda (s)
 			      (if (char-ready? pipe-r)
 				  (read-bytes-avail!* s pipe-r)
-				  (parameterize ([break-enabled #f])
-				    (if (semaphore-try-wait? lock-semaphore)
-					;; If there's an error here, the
-					;; port will remain locked.
-					(let ([v (read-chars s)])
-					  (semaphore-post lock-semaphore)
-					  v)
-					(wrap-evt
-					 (semaphore-peek-evt lock-semaphore)
-					 (lambda (x) 0))))))
+				  (if (semaphore-try-wait? lock-semaphore)
+				      ;; If there's an error here, the
+				      ;; port will remain locked.
+				      (let ([v (read-chars s)])
+					(semaphore-post lock-semaphore)
+					v)
+				      (wrap-evt
+				       (semaphore-peek-evt lock-semaphore)
+				       (lambda (x) 0)))))
 			    (lambda (s skip general-peek)
 			      (let ([v (peek-bytes-avail!* s skip pipe-r)])
 				(if (zero? v)