From: Chris Hanson <org/chris-hanson/cph>
Date: Sun, 23 Apr 1989 23:26:47 +0000 (+0000)
Subject: Change usage of `mark-permanent!'.
X-Git-Tag: 20090517-FFI~12131
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=d2ca211080f99dd76ce2603c7cd441cd6bf0d8a4;p=mit-scheme.git

Change usage of `mark-permanent!'.
---

diff --git a/v7/src/edwin/fill.scm b/v7/src/edwin/fill.scm
index 4cd0acf62..ab00a62bb 100644
--- 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 70ae27f1a..f534b7749 100644
--- 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 4c5a9afa0..a76ec196a 100644
--- 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