Tuning.

diff --git a/v7/src/edwin/motion.scm b/v7/src/edwin/motion.scm
index c87f65538410134edd35a35bc1aef8c65a082158..fda4378652660d80c5dff5278361128575ae8825 100644 (file)
--- a/v7/src/edwin/motion.scm
+++ b/v7/src/edwin/motion.scm
@@ -1,8 +1,8 @@
 ;;; -*-Scheme-*-
 ;;;
-;;;    $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/motion.scm,v 1.81 1989/08/14 09:22:53 cph Exp $
+;;;    $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/motion.scm,v 1.82 1990/11/02 03:12:37 cph Rel $
 ;;;
-;;;    Copyright (c) 1985, 1989 Massachusetts Institute of Technology
+;;;    Copyright (c) 1985, 1989, 1990 Massachusetts Institute of Technology
 ;;;
 ;;;    This material was developed by the Scheme project at the
 ;;;    Massachusetts Institute of Technology, Department of
@@ -216,13 +216,13 @@
 (define (group-column-length group start-index end-index start-column)
   (if (fix:= start-index end-index)
       0
-      (let ((start (group-index->position group start-index true))
-           (end (group-index->position group end-index false))
+      (let ((start (group-index->position-integrable group start-index true))
+           (end (group-index->position-integrable group end-index false))
            (gap-start (group-gap-start group))
            (gap-end (group-gap-end group))
            (text (group-text group)))
-       (if (and (not (fix:> start gap-start))
-                (not (fix:> gap-end end)))
+       (if (and (fix:<= start gap-start)
+                (fix:<= gap-end end))
            (substring-column-length text gap-end end
              (substring-column-length text start gap-start start-column))
            (substring-column-length text start end start-column)))))
@@ -230,14 +230,14 @@
 (define (group-column->index group start-index end-index start-column column)
   (if (fix:= start-index end-index)
       start-index
-      (let ((start (group-index->position group start-index true))
-           (end (group-index->position group end-index false))
+      (let ((start (group-index->position-integrable group start-index true))
+           (end (group-index->position-integrable group end-index false))
            (gap-start (group-gap-start group))
            (gap-end (group-gap-end group))
            (text (group-text group)))
-       (cond ((not (fix:> end gap-start))
+       (cond ((fix:<= end gap-start)
               (substring-column->index text start end start-column column))
-             ((not (fix:< start gap-end))
+             ((fix:>= start gap-end)
               (fix:- (substring-column->index text start end
                                               start-column column)
                      (group-gap-length group)))

diff --git a/v7/src/edwin/search.scm b/v7/src/edwin/search.scm
index 1fb5ec9f9fadc404f5bcdc09c9ce9be34c4fda66..081600cd1d7f14d980f424a3e2c3a3467d913614 100644 (file)
--- a/v7/src/edwin/search.scm
+++ b/v7/src/edwin/search.scm
@@ -1,8 +1,8 @@
 ;;; -*-Scheme-*-
 ;;;
-;;;    $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/search.scm,v 1.146 1989/04/28 22:53:11 cph Rel $
+;;;    $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/search.scm,v 1.147 1990/11/02 03:13:38 cph Rel $
 ;;;
-;;;    Copyright (c) 1986, 1989 Massachusetts Institute of Technology
+;;;    Copyright (c) 1986, 1989, 1990 Massachusetts Institute of Technology
 ;;;
 ;;;    This material was developed by the Scheme project at the
 ;;;    Massachusetts Institute of Technology, Department of
@@ -71,36 +71,50 @@
     (and index (make-mark (mark-group start) index))))
 |#
 (define (%find-next-newline group start end)
-  (and (not (= start end))
+  ;; Assume (FIX:<= START END)
+  (and (not (fix:= start end))
        (let ((start (group-index->position group start true))
-            (end (group-index->position group end false))
-            (gap-start (group-gap-start group))
-            (gap-end (group-gap-end group))
-            (text (group-text group))
-            (char #\newline))
-        (let ((pos
-               (if (and (<= start gap-start) (<= gap-end end))
-                   (or (substring-find-next-char text start gap-start char)
-                       (substring-find-next-char text gap-end end char))
-                   (substring-find-next-char text start end char))))
-          (and pos
-               (group-position->index group pos))))))
+            (end (group-index->position group end false)))
+        (let ((position
+               (if (and (fix:<= start (group-gap-start group))
+                        (fix:<= (group-gap-end group) end))
+                   (or (substring-find-next-char (group-text group)
+                                                 start
+                                                 (group-gap-start group)
+                                                 #\newline)
+                       (substring-find-next-char (group-text group)
+                                                 (group-gap-end group)
+                                                 end
+                                                 #\newline))
+                   (substring-find-next-char (group-text group)
+                                             start
+                                             end
+                                             #\newline))))
+          (and position
+               (group-position->index group position))))))
 
 (define (%find-previous-newline group start end)
-  (and (not (= start end))
+  ;; Assume (FIX:>= START END)
+  (and (not (fix:= start end))
        (let ((start (group-index->position group start false))
-            (end (group-index->position group end true))
-            (gap-start (group-gap-start group))
-            (gap-end (group-gap-end group))
-            (text (group-text group))
-            (char #\newline))
-        (let ((pos
-               (if (and (<= end gap-start) (<= gap-end start))
-                   (or (substring-find-previous-char text gap-end start char)
-                       (substring-find-previous-char text end gap-start char))
-                   (substring-find-previous-char text end start char))))
-          (and pos
-               (1+ (group-position->index group pos)))))))
+            (end (group-index->position group end true)))
+        (let ((position
+               (if (and (fix:<= end (group-gap-start group))
+                        (fix:<= (group-gap-end group) start))
+                   (or (substring-find-previous-char (group-text group)
+                                                     (group-gap-end group)
+                                                     start
+                                                     #\newline)
+                       (substring-find-previous-char (group-text group)
+                                                     end
+                                                     (group-gap-start group)
+                                                     #\newline))
+                   (substring-find-previous-char (group-text group)
+                                                 end
+                                                 start
+                                                 #\newline))))
+          (and position
+               (fix:+ (group-position->index group position) 1))))))
 \f
 ;;;; Character-set Search
 #|