From 482e0a363672625d8b44ec344ce55080e7733ab9 Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Sun, 19 Feb 2017 17:37:51 -0800
Subject: [PATCH] Update to use new procedures.

---
 src/edwin/xterm.scm           | 21 +++++++++++++--------
 src/x11-screen/x11-screen.scm | 21 +++++++++++++--------
 2 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/src/edwin/xterm.scm b/src/edwin/xterm.scm
index 570785ea2..bdfd7f48b 100644
--- a/src/edwin/xterm.scm
+++ b/src/edwin/xterm.scm
@@ -994,18 +994,23 @@ USA.
 		 (if (= b/w 1)
 		     (make-string bytes)
 		     (make-vector (quotient bytes b/w))))
-		(move!
+		(copy!
 		 (if (= b/w 1)
-		     substring-move-right!
-		     subvector-move-right!)))
+		     string-copy!
+		     vector-copy!)))
 	    (let loop ((offset 0) (bytes bytes))
 	      (if (<= bytes qb)
-		  (move! (read-once offset bytes bytes delete?)
-			 0 (quotient bytes b/w)
-			 result (quotient offset b/w))
+		  (copy! result
+			 (quotient offset b/w)
+			 (read-once offset bytes bytes delete?)
+			 0
+			 (quotient bytes b/w))
 		  (begin
-		    (move! (read-once offset bytes qb #f) 0 (quotient qb b/w)
-			   result (quotient offset b/w))
+		    (copy! result
+			   (quotient offset b/w)
+			   (read-once offset bytes qb #f)
+			   0
+			   (quotient qb b/w))
 		    (loop (+ offset qb) (- bytes qb)))))
 	    result)))))
 
diff --git a/src/x11-screen/x11-screen.scm b/src/x11-screen/x11-screen.scm
index 6c6966c19..e2c36a66e 100644
--- a/src/x11-screen/x11-screen.scm
+++ b/src/x11-screen/x11-screen.scm
@@ -933,18 +933,23 @@ USA.
 		 (if (= b/w 1)
 		     (make-string bytes)
 		     (make-vector (quotient bytes b/w))))
-		(move!
+		(copy!
 		 (if (= b/w 1)
-		     substring-move-right!
-		     subvector-move-right!)))
+		     string-copy!
+		     vector-copy!)))
 	    (let loop ((offset 0) (bytes bytes))
 	      (if (<= bytes qb)
-		  (move! (read-once offset bytes bytes delete?)
-			 0 (quotient bytes b/w)
-			 result (quotient offset b/w))
+		  (copy! result
+			 (quotient offset b/w)
+			 (read-once offset bytes bytes delete?)
+			 0
+			 (quotient bytes b/w))
 		  (begin
-		    (move! (read-once offset bytes qb #f) 0 (quotient qb b/w)
-			   result (quotient offset b/w))
+		    (copy! result
+			   (quotient offset b/w)
+			   (read-once offset bytes qb #f)
+			   0
+			   (quotient qb b/w))
 		    (loop (+ offset qb) (- bytes qb)))))
 	    result)))))
 
-- 
2.25.1