From e49b2c850532e2bbcc7772d7a0ee71b55fd787b9 Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Tue, 2 Apr 1991 19:45:32 +0000
Subject: [PATCH] Update description of Edwin mark structure to match change in
 Edwin version 3.31.  Previous versions of Edwin will not work correctly with
 this microcode.

---
 v7/src/microcode/edwin.h   |  8 ++++----
 v7/src/microcode/rgxprim.c | 10 ++++++----
 v7/src/microcode/version.h |  4 ++--
 v8/src/microcode/version.h |  4 ++--
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/v7/src/microcode/edwin.h b/v7/src/microcode/edwin.h
index 1b4c5fada..14db24ddb 100644
--- a/v7/src/microcode/edwin.h
+++ b/v7/src/microcode/edwin.h
@@ -1,8 +1,8 @@
 /* -*-C-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/edwin.h,v 1.4 1989/09/20 23:07:42 cph Rel $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/edwin.h,v 1.5 1991/04/02 19:45:17 cph Exp $
 
-Copyright (c) 1987, 1988, 1989 Massachusetts Institute of Technology
+Copyright (c) 1987-91 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -34,7 +34,7 @@ MIT in each case. */
 
 /* Definitions for Edwin data structures.
    This MUST match the definitions in the Edwin source code. */
-
+
 #define GROUP_P VECTOR_P
 #define GROUP_TEXT(group) (VECTOR_REF ((group), 1))
 
@@ -51,5 +51,5 @@ MIT in each case. */
 #define GROUP_END_MARK(group) (VECTOR_REF ((group), 7))
 
 #define MARK_GROUP(mark) (VECTOR_REF ((mark), 1))
-#define MARK_POSITION(mark) (UNSIGNED_FIXNUM_TO_LONG (VECTOR_REF ((mark), 2)))
+#define MARK_INDEX(mark) (UNSIGNED_FIXNUM_TO_LONG (VECTOR_REF ((mark), 2)))
 #define MARK_LEFT_INSERTING(mark) ((VECTOR_REF ((mark), 3)) != SHARP_F)
diff --git a/v7/src/microcode/rgxprim.c b/v7/src/microcode/rgxprim.c
index da55112e0..fe895075c 100644
--- a/v7/src/microcode/rgxprim.c
+++ b/v7/src/microcode/rgxprim.c
@@ -1,8 +1,8 @@
 /* -*-C-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/rgxprim.c,v 1.8 1989/09/20 23:11:16 cph Rel $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/rgxprim.c,v 1.9 1991/04/02 19:45:24 cph Exp $
 
-Copyright (c) 1987, 1988, 1989 Massachusetts Institute of Technology
+Copyright (c) 1987-91 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -198,9 +198,11 @@ DEFINE_PRIMITIVE ("RE-SEARCH-SUBSTRING-BACKWARD", Prim_re_search_substr_backward
   match_start = (arg_nonnegative_integer (6));				\
   match_end = (arg_nonnegative_integer (7));				\
   text = (STRING_LOC ((GROUP_TEXT (group)), 0));			\
-  text_start = (MARK_POSITION (GROUP_START_MARK (group)));		\
-  text_end = (MARK_POSITION (GROUP_END_MARK (group)));			\
+  text_start = (MARK_INDEX (GROUP_START_MARK (group)));			\
+  text_end = (MARK_INDEX (GROUP_END_MARK (group)));			\
   gap_start = (GROUP_GAP_START (group));				\
+  if (text_end > gap_start)						\
+    text_end += (GROUP_GAP_LENGTH (group));				\
   if (match_end > gap_start)						\
     {									\
       match_end += (GROUP_GAP_LENGTH (group));				\
diff --git a/v7/src/microcode/version.h b/v7/src/microcode/version.h
index 08f9bc359..297ba5af4 100644
--- a/v7/src/microcode/version.h
+++ b/v7/src/microcode/version.h
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/Attic/version.h,v 11.72 1991/03/28 20:08:35 jinx Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/Attic/version.h,v 11.73 1991/04/02 19:45:32 cph Exp $
 
 Copyright (c) 1988-91 Massachusetts Institute of Technology
 
@@ -46,5 +46,5 @@ MIT in each case. */
 #define VERSION		11
 #endif
 #ifndef SUBVERSION
-#define SUBVERSION	72
+#define SUBVERSION	73
 #endif
diff --git a/v8/src/microcode/version.h b/v8/src/microcode/version.h
index 020592cb7..ed95b9b5c 100644
--- a/v8/src/microcode/version.h
+++ b/v8/src/microcode/version.h
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/microcode/version.h,v 11.72 1991/03/28 20:08:35 jinx Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/microcode/version.h,v 11.73 1991/04/02 19:45:32 cph Exp $
 
 Copyright (c) 1988-91 Massachusetts Institute of Technology
 
@@ -46,5 +46,5 @@ MIT in each case. */
 #define VERSION		11
 #endif
 #ifndef SUBVERSION
-#define SUBVERSION	72
+#define SUBVERSION	73
 #endif
-- 
2.25.1