From e160dc9e5e9d1f49f352d7d56fb275bd4c293af4 Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Fri, 5 Jan 2018 02:10:08 -0500
Subject: [PATCH] Fix emacs interface breakage caused by string rewrite.

---
 src/runtime/emacs.scm | 55 +++++++++++++++++++++++++------------------
 1 file changed, 32 insertions(+), 23 deletions(-)

diff --git a/src/runtime/emacs.scm b/src/runtime/emacs.scm
index 5b56ea257..72430c725 100644
--- a/src/runtime/emacs.scm
+++ b/src/runtime/emacs.scm
@@ -178,42 +178,43 @@ USA.
 
 (define (emacs/gc-start port)
   (output-port/flush-output port)
-  (cwb (output-port-channel port) "\033b" 0 2))
+  (cwb (output-port-channel port) gc-start-bytes))
 
 (define (emacs/gc-finish port)
-  (cwb (output-port-channel port) "\033e" 0 2))
+  (cwb (output-port-channel port) gc-end-bytes))
 
 (define (transmit-signal port type)
   (let ((channel (output-port-channel port))
-	(buffer (string #\altmode type)))
+	(buffer (string->utf8 (string #\esc type))))
     (output-port/flush-output port)
     (with-absolutely-no-interrupts
      (lambda ()
-       (cwb channel buffer 0 2)))))
+       (cwb channel buffer)))))
 
 (define (transmit-signal-with-argument port type string)
   (let ((channel (output-port-channel port))
-	(length (string-length string)))
-    (let ((buffer-length (+ length 3)))
-      (let ((buffer (make-string buffer-length)))
-	(string-set! buffer 0 #\altmode)
-	(string-set! buffer 1 type)
-	(string-copy! buffer 2 string 0 length)
-	(string-set! buffer (- buffer-length 1) #\altmode)
-	(output-port/flush-output port)
-	(with-absolutely-no-interrupts
-	 (lambda ()
-	   (cwb channel buffer 0 buffer-length)))))))
-
-(define (cwb channel string start end)
+	(buffer
+	 (let ((builder (bytevector-builder)))
+	   (builder (char->integer #\esc))
+	   (builder (char->integer type))
+	   (builder (string->utf8 string))
+	   (builder (char->integer #\esc))
+	   (builder))))
+    (output-port/flush-output port)
+    (with-absolutely-no-interrupts
+     (lambda ()
+       (cwb channel buffer)))))
+
+(define (cwb channel bytes)
   ;; This is a private copy of CHANNEL-WRITE-BLOCK that bypasses all
   ;; the threading hair in that procedure.
-  (let loop ((start start) (n-left (fix:- end start)))
-    (let ((n
-	   ((ucode-primitive channel-write 4) (channel-descriptor channel)
-					      string start end)))
-      (cond ((not n) (loop start n-left))
-	    ((fix:< n n-left) (loop (fix:+ start n) (fix:- n-left n)))))))
+  (let ((end (bytevector-length bytes)))
+    (let loop ((start 0) (n-left end))
+      (let ((n
+	     ((ucode-primitive channel-write 4) (channel-descriptor channel)
+						bytes start end)))
+	(cond ((not n) (loop start n-left))
+	      ((fix:< n n-left) (loop (fix:+ start n) (fix:- n-left n))))))))
 
 (define (emacs-typeout port message)
   (emacs-eval port "(message \"%s\" " (write-to-string message) ")"))
@@ -223,10 +224,18 @@ USA.
 
 ;;;; Initialization
 
+(define gc-start-bytes)
+(define gc-end-bytes)
 (define vanilla-console-port-type)
 (define emacs-console-port-type)
 
 (define (initialize-package!)
+  (set! gc-start-bytes
+	(bytevector (char->integer #\esc)
+		    (char->integer #\b)))
+  (set! gc-end-bytes
+	(bytevector (char->integer #\esc)
+		    (char->integer #\e)))
   (set! vanilla-console-port-type (textual-port-type the-console-port))
   (set! emacs-console-port-type
 	(make-textual-port-type
-- 
2.25.1