Correct bug in primitive X-FONT-STRUCTURE.

diff --git a/v7/src/microcode/version.h b/v7/src/microcode/version.h
index 72884bc5eb84b8512ea39c07c7d3e00849fd83f4..48c12aab78099702e58dd99532103bfc49fa4cc4 100644 (file)
--- 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.104 1992/01/20 21:15:50 jinx Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/Attic/version.h,v 11.105 1992/01/22 22:35:53 arthur Exp $
 
 Copyright (c) 1988-92 Massachusetts Institute of Technology
 
@@ -46,5 +46,5 @@ MIT in each case. */
 #define VERSION                11
 #endif
 #ifndef SUBVERSION
-#define SUBVERSION     104
+#define SUBVERSION     105
 #endif

diff --git a/v7/src/microcode/x11base.c b/v7/src/microcode/x11base.c
index 1deab94ccc945f350d5bbf6bc41df6505743440f..2fc9b6b0aee01f603549f34c0dcadeb721572328 100644 (file)
--- a/v7/src/microcode/x11base.c
+++ b/v7/src/microcode/x11base.c
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/x11base.c,v 1.28 1991/12/19 19:52:51 arthur Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/x11base.c,v 1.29 1992/01/22 22:35:09 arthur Exp $
 
 Copyright (c) 1989-91 Massachusetts Institute of Technology
 
@@ -1218,15 +1218,15 @@ DEFINE_PRIMITIVE ("X-FONT-STRUCTURE", Prim_x_font_structure, 2, 2, 0)
     else
       {
        unsigned int start_index = (saved_font -> min_char_or_byte2);
-       unsigned int end_index = (saved_font -> max_char_or_byte2);
        unsigned int index;
+       unsigned int length = 
+         (start_index - (saved_font -> max_char_or_byte2) + 1);
        SCHEME_OBJECT character_vector =
-         (allocate_marked_vector
-          (TC_VECTOR, (end_index - start_index + 1), true));
-       for (index = start_index; index <= end_index; index++)
+         (allocate_marked_vector (TC_VECTOR, length, true));
+       for (index = 0; index < length; index++)
          {
            VECTOR_SET (character_vector,
-                       (index - start_index),
+                       index,
                        convert_char_struct ((saved_font -> per_char) + index));
          }
        VECTOR_SET (result, 6, (long_to_integer (start_index)));

diff --git a/v8/src/microcode/version.h b/v8/src/microcode/version.h
index 9589ac66ffa9a438ac2eb8bb44993a3eb376dd57..e7a3f723a35ea3c10b50ccf8662bc13be61d3563 100644 (file)
--- 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.104 1992/01/20 21:15:50 jinx Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/microcode/version.h,v 11.105 1992/01/22 22:35:53 arthur Exp $
 
 Copyright (c) 1988-92 Massachusetts Institute of Technology
 
@@ -46,5 +46,5 @@ MIT in each case. */
 #define VERSION                11
 #endif
 #ifndef SUBVERSION
-#define SUBVERSION     104
+#define SUBVERSION     105
 #endif