I broke the index feature when I threw my stuff in. This fixes it.

-- presotto

SCCS-vsn: usr.bin/vgrind/vfontedpr.c 1.8

diff --git a/usr/src/usr.bin/vgrind/vfontedpr.c b/usr/src/usr.bin/vgrind/vfontedpr.c
index 605411c..7200d96 100644 (file)
--- a/usr/src/usr.bin/vgrind/vfontedpr.c
+++ b/usr/src/usr.bin/vgrind/vfontedpr.c
@@ -297,7 +297,6 @@ putScp(os)
 {
     register char *s = os;             /* pointer to unmatched string */
     char dummy[BUFSIZ];                        /* dummy to be used by expmatch */
 {
     register char *s = os;             /* pointer to unmatched string */
     char dummy[BUFSIZ];                        /* dummy to be used by expmatch */

-    int xfld = 0;

     char *comptr;                      /* end of a comment delimiter */
     char *strptr;                      /* end of a string delimiter */
     char *chrptr;                      /* end of a character const delimiter */
     char *comptr;                      /* end of a comment delimiter */
     char *strptr;                      /* end of a string delimiter */
     char *chrptr;                      /* end of a character const delimiter */


@@ -321,18 +320,6 @@ putScp(os)
     } 
 skip:
     do {
     } 
 skip:
     do {

-       if (index) {
-           if (*s == ' ' || *s == '\t') {
-               if (xfld == 0)  
-                   printf("\ 1");
-               printf("\t");
-               xfld = 1;
-               while (*s == ' ' || *s == '\t')
-                   s++;
-               continue;
-           }
-       }
-

        /* check for string, comment, blockstart, etc */
        if (!incomm && !instr && !inchr) {
 
        /* check for string, comment, blockstart, etc */
        if (!incomm && !instr && !inchr) {
 


@@ -463,8 +450,20 @@ putKcp (start, end, force)
     boolean    force;          /* true if we should force nokeyw */
 {
     int i;
     boolean    force;          /* true if we should force nokeyw */
 {
     int i;

+    int xfld = 0;

 
     while (start <= end) {
 
     while (start <= end) {

+       if (index) {
+           if (*start == ' ' || *start == '\t') {
+               if (xfld == 0)  
+                   printf("\ 1");
+               printf("\t");
+               xfld = 1;
+               while (*start == ' ' || *start == '\t')
+                   start++;
+               continue;
+           }
+       }

 
        /* take care of nice tab stops */
        if (*start == '\t') {
 
        /* take care of nice tab stops */
        if (*start == '\t') {