Update to use new procedures.

diff --git a/src/edwin/xterm.scm b/src/edwin/xterm.scm
index 570785ea29f712ea9d66800464bf71e89d2c4407..bdfd7f48b82eafca8a5d399a7639955f916329f0 100644 (file)
--- 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)))))
 \f

diff --git a/src/x11-screen/x11-screen.scm b/src/x11-screen/x11-screen.scm
index 6c6966c19fdfc386b10abfbcf051a9c4156d0cd8..e2c36a66e91ecf8a7abb73848db86af086f290af 100644 (file)
--- 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)))))
 \f