Change usage of `mark-permanent!'.

diff --git a/v7/src/edwin/fill.scm b/v7/src/edwin/fill.scm
index 4cd0acf62ae1a06d621a6c5191db39807a18ba2e..ab00a62bbde0f045329b36a89bd7472f241ddf9a 100644 (file)
--- a/v7/src/edwin/fill.scm
+++ b/v7/src/edwin/fill.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;;    $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/fill.scm,v 1.42 1989/04/15 00:49:34 cph Exp $
+;;;    $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/fill.scm,v 1.43 1989/04/23 23:21:39 cph Exp $
 ;;;
 ;;;    Copyright (c) 1986, 1989 Massachusetts Institute of Technology
 ;;;
@@ -199,14 +199,15 @@ With argument, turn auto-fill mode on iff argument is positive."
   "The number of columns to indent each line."  0)
 
 (define (center-line mark)
-  (mark-permanent! mark)
-  (delete-horizontal-space (line-start mark 0))
-  (delete-horizontal-space (line-end mark 0))
-  (let ((d (- (- (ref-variable fill-column) (ref-variable left-margin))
-             (mark-column (line-end mark 0)))))
-    (if (positive? d)
-       (insert-horizontal-space (+ (ref-variable left-margin) (quotient d 2))
-                                (line-start mark 0)))))
+  (let ((mark (mark-permanent! mark)))
+    (delete-horizontal-space (line-start mark 0))
+    (delete-horizontal-space (line-end mark 0))
+    (let ((d (- (- (ref-variable fill-column) (ref-variable left-margin))
+               (mark-column (line-end mark 0)))))
+      (if (positive? d)
+         (insert-horizontal-space (+ (ref-variable left-margin)
+                                     (quotient d 2))
+                                  (line-start mark 0))))))
 
 (define-command center-line
   "Center the line point is on, within the width specified by `fill-column'.

diff --git a/v7/src/edwin/reccom.scm b/v7/src/edwin/reccom.scm
index 70ae27f1aa32c7f8c1f3bfe61f9d42d8387499cc..f534b77498540b6e382c707e5f3035b9fcca514a 100644 (file)
--- a/v7/src/edwin/reccom.scm
+++ b/v7/src/edwin/reccom.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;;    $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/reccom.scm,v 1.11 1989/04/15 00:52:11 cph Exp $
+;;;    $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/reccom.scm,v 1.12 1989/04/23 23:25:44 cph Exp $
 ;;;
 ;;;    Copyright (c) 1986, 1989 Massachusetts Institute of Technology
 ;;;
@@ -106,10 +106,10 @@ The text previously in the region is overwritten by the blanks."
   (lambda ()
     (delete-rectangle (current-mark) (current-point) true)))
 
-(define (make-space-to-column column mark) ;new make-space-to-column
-  (mark-permanent! mark)
-  (change-column column mark)
-  (line-end mark 0))
+(define (make-space-to-column column mark)
+  (let ((mark (mark-permanent! mark)))
+    (change-column column mark)
+    (line-end mark 0)))
 
 (define (yank-rectangle rectangle point)
   (let ((goal (mark-column point)))

diff --git a/v7/src/edwin/things.scm b/v7/src/edwin/things.scm
index 4c5a9afa02dd82553a19315a368480585c71115a..a76ec196a5d601889425367b53eac3c3799daf8c 100644 (file)
--- a/v7/src/edwin/things.scm
+++ b/v7/src/edwin/things.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;;    $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/things.scm,v 1.76 1989/04/15 00:53:32 cph Exp $
+;;;    $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/things.scm,v 1.77 1989/04/23 23:26:47 cph Exp $
 ;;;
 ;;;    Copyright (c) 1985, 1989 Massachusetts Institute of Technology
 ;;;
@@ -271,9 +271,9 @@
        (change-column column point))))
 
 (define (change-column column point)
-  (mark-permanent! point)
-  (delete-horizontal-space point)
-  (insert-horizontal-space column point))
+  (let ((point (mark-permanent! point)))
+    (delete-horizontal-space point)
+    (insert-horizontal-space column point)))
 
 ;;;; Lines