From 6885035ff47bf7286b4067eea360d992b5796567 Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Tue, 27 Feb 2001 17:16:12 +0000
Subject: [PATCH] Fix initialization of console port: must notice when standard
 I/O ports are encapsulations of the console port.

---
 v7/src/runtime/emacs.scm | 37 +++++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/v7/src/runtime/emacs.scm b/v7/src/runtime/emacs.scm
index 1151ebd62..8c3b4706d 100644
--- a/v7/src/runtime/emacs.scm
+++ b/v7/src/runtime/emacs.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: emacs.scm,v 14.27 1999/06/21 03:46:54 cph Exp $
+$Id: emacs.scm,v 14.28 2001/02/27 17:16:12 cph Exp $
 
-Copyright (c) 1988-1999 Massachusetts Institute of Technology
+Copyright (c) 1988-2001 Massachusetts Institute of Technology
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -234,28 +234,33 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 (define (reset-console-port!)
   ;; This is a kludge.  Maybe this method shouldn't be used.
-  (let ((new-port (select-console-port)))
+  (let* ((new-port (select-console-port))
+	 (old-port?
+	  (lambda (port)
+	    (and (or (eq? port the-console-port)
+		     (eq? port emacs-console-port))
+		 (not (eq? port new-port)))))
+	 (replacement-port
+	  (lambda (port)
+	    (cond ((old-port? port) new-port)
+		  ((and (transcriptable-port? port)
+			(old-port? (encapsulated-port/port port)))
+		   (make-transcriptable-port new-port))
+		  (else #f)))))
     (if (let ((port console-i/o-port))
 	  (or (eq? port the-console-port)
 	      (eq? port emacs-console-port)))
 	(set-console-i/o-port! new-port))
     (do ((pairs standard-port-accessors (cdr pairs)))
 	((null? pairs))
-      (if (let ((port ((caar pairs))))
-	    (or (eq? port the-console-port)
-		(eq? port emacs-console-port)))
-	  ((cdar pairs) new-port)))
+      (let ((port (replacement-port ((caar pairs)))))
+	(if port
+	    ((cdar pairs) port))))
     (do ((cmdl (nearest-cmdl) (cmdl/parent cmdl)))
 	((not cmdl))
-      (let ((port (cmdl/port cmdl)))
-	(cond ((or (eq? port the-console-port)
-		   (eq? port emacs-console-port))
-	       (set-cmdl/port! cmdl new-port))
-	      ((and (transcriptable-port? port)
-		    (let ((port (encapsulated-port/port port)))
-		      (or (eq? port the-console-port)
-			  (eq? port emacs-console-port))))
-	       (set-cmdl/port! cmdl (make-transcriptable-port new-port))))))))
+      (let ((port (replacement-port (cmdl/port cmdl))))
+	(if port
+	    (set-cmdl/port! cmdl port))))))
 
 (define (select-console-port)
   (set! console-output-channel (port/output-channel the-console-port))
-- 
2.25.1