@@ -179,7 +179,7 @@ redata_highlighter_add_or_unadd(redata_t *redata, redata_plugin_t *slot, undo_t

         if(redata==NULL || slot==NULL || hl==NULL || undo==NULL || stack==NULL || slot->active==0)

                 return(-1); /* sanity check failed */

         if(hl->usedlines==0) {

-#if 1

+#if 0

 fprintf(stderr,"INVALIDATING USEDLINELINES==0 (nothing to do)\n");

 #endif

                 return(0); /* nothing to do */

@@ -203,7 +203,7 @@ fprintf(stderr,"INVALIDATING USEDLINELINES==0 (nothing to do)\n");

         /* invalidate from this line on */

         nline=(nline<0)?0:nline;

         hl_invalidatefrom(redata,hl,nline);

-#if 1

+#if 0

 fprintf(stderr,"INVALIDATING LINE %i\n",nline);

 #endif

         return(0);

@@ -404,25 +404,67 @@ fprintf(stderr,"Doing line %i pos:%li\n",nline,line->pos);

         hl->useddirectivebuf=0;

         mlcprevmode=mode_whatever;

         do {

-                if(redata_line_rawinfo(redata,realpos+posoffset,&pos,&ptr,&len,NULL)==-1)

+                if(redata_line_rawinfo(redata,realpos+posoffset,&pos,&ptr,&len,NULL)==-1) {

+#if 0

+fprintf(stderr,"nline:%i ERROR: couldn't get lineinfo for realpos:%li posoffset:%i realpos+posoffset:%li redataused:%li\n",

+nline,realpos,posoffset,realpos+posoffset,redata_getused(redata));

+#endif

                         return(-1); /* couldn't get line data */

+                }

                 has_nl=((len>0 && ptr[len-1]=='\n')?1:0);

                 has_next=(len==0)?1:(ptr[len-1]=='\n')?0:1;

                 /* special case: line with only a newline */

                 if(posoffset==0 && has_nl==1 && len==1) {

                         /* delete the existing linecolor and break */

                         line->len=0;

+#if 0

+fprintf(stderr,"nline:%i detected blank line, exiting\n",nline);

+#endif

                         break;

                 }

                 /* iterate */

 #if 0

-fprintf(stderr,"Line %i chunk at posoffset %i\n",nline, posoffset);

+#define HDEBUGLINE 775

+if(nline==HDEBUGLINE || nline==(HDEBUGLINE+1)) {

+fprintf(stderr,"Line %i chunk at posoffset:%i (realpos:%li)\n",nline, posoffset,realpos);

+fprintf(stderr,"NEW RAWINFO, nline:%i len:%i has_nl:%i has_next:%i mode:%s(%i) mlcprevmode:%s(%i)\n",nline,len,has_nl,has_next,

+mode==mode_whatever?"whatever":

+mode==mode_in_multilinecomment?"mlc":

+mode==mode_in_linecomment?"comment":

+mode==mode_in_directive?"directive":

+mode==mode_in_string?"string":

+mode==mode_in_directivestring?"directivestring":"unknown",

+mode,

+mlcprevmode==mode_whatever?"whatever":

+mlcprevmode==mode_in_multilinecomment?"mlc":

+mlcprevmode==mode_in_linecomment?"comment":

+mlcprevmode==mode_in_directive?"directive":

+mlcprevmode==mode_in_string?"string":

+mlcprevmode==mode_in_directivestring?"directivestring":"unknown",

+mlcprevmode

+);

+}

 #endif

-#warning FALTA PONER DE UN COLOR DIFERENTE lo de <nombre.h> de los #include (pero no de los #define!)

                 for(i=0;i<(len-has_nl);prev_char=(ptr[i]&prev_char_mask),prev_char_mask=0xff,i++) {

 #if 0

-if(nline==1)

-        fprintf(stderr,"ptr[%i]='%c' prev_char='%s%c'\n",i,ptr[i],(prev_char=='\0')?"\\":"",(prev_char=='\0')?'0':prev_char);

+if(nline==HDEBUGLINE || nline==(HDEBUGLINE+1)) {

+fprintf(stderr,"ptr[%i]='%c' prev_char='%s%c' mode=%s(%i) mlcprevmode=%s(%i)\n",i,ptr[i],(prev_char=='\0')?"\\":"",(prev_char=='\0')?'0':prev_char,

+mode==mode_whatever?"whatever":

+mode==mode_in_multilinecomment?"mlc":

+mode==mode_in_linecomment?"comment":

+mode==mode_in_directive?"directive":

+mode==mode_in_string?"string":

+mode==mode_in_directivestring?"directivestring":"unknown",

+mode,

+mlcprevmode==mode_whatever?"whatever":

+mlcprevmode==mode_in_multilinecomment?"mlc":

+mlcprevmode==mode_in_linecomment?"comment":

+mlcprevmode==mode_in_directive?"directive":

+mlcprevmode==mode_in_string?"string":

+mlcprevmode==mode_in_directivestring?"directivestring":"unknown",

+mlcprevmode

+);

+}

 #endif

                         /* special case: keyword ends in a change of mode */

                         if(mode!=mode_whatever && hl->usedkeywordbuf>0) {

@@ -595,7 +637,7 @@ if(nline==1)

                         }

                 }

                 posoffset+=len;

-        } while(has_next!=0 && (pos+posoffset)<redataused);

+        } while(has_next!=0 && (realpos+posoffset)<redataused);

         /* special case: keyword ends at end-of-line */

         if(mode==mode_whatever && hl->usedkeywordbuf>0 && hl_searchlist(keywords,nkeywords,hl->keywordbuf,hl->usedkeywordbuf,NULL)==0) {

                 linecolor=hl_addtolinecolor(&opaque,hl,linecolor,hl->keywordbufstart,color_keyword);

@@ -752,8 +794,8 @@ hl_addtolinecolor(int *opaque, highlighter_t *hl,linecolor_t *linecolor,int poso

         if(opaque==NULL || *opaque<0 || hl==NULL || (posoff!=0 && linecolor==NULL) || color<0 || posoff<0)

                 return(NULL); /* sanity check failed */

 #if 0

-#define DEBUGLINE 12

-if(hl->usedlines==DEBUGLINE) {

+#define DEBUGLINE 775

+if(hl->usedlines==DEBUGLINE || hl->usedlines==(DEBUGLINE+1)) {

 int i,k;

 int l=hl->lines[hl->usedlines].len;

 linecolor_t *lc=(linecolor_t *) (hl->buf+hl->lines[hl->usedlines].off);

@@ -797,7 +839,7 @@ hl->useddirectivebuf,

                 linecolor->color=color;

                 *opaque=1;

 #if 0

-if(hl->usedlines==DEBUGLINE) {

+if(hl->usedlines==DEBUGLINE || hl->usedlines==(DEBUGLINE+1)) {

 int i,k;

 int l=hl->lines[hl->usedlines].len;

 linecolor_t *lc=(linecolor_t *) (hl->buf+hl->lines[hl->usedlines].off);

@@ -836,7 +878,7 @@ fprintf(stderr,"\"\n");

                 linecolor[-1].len+=added;

                 *opaque+=added;

 #if 0

-if(hl->usedlines==DEBUGLINE) {

+if(hl->usedlines==DEBUGLINE || hl->usedlines==(DEBUGLINE+1)) {

 int i,k;

 int l=hl->lines[hl->usedlines].len;

 linecolor_t *lc=(linecolor_t *) (hl->buf+hl->lines[hl->usedlines].off);

@@ -857,7 +899,7 @@ fprintf(stderr,"\"\n");

         line->len+=sizeof(linecolor_t);

         hl->usedbuf+=sizeof(linecolor_t);

 #if 0

-if(hl->usedlines==DEBUGLINE) {

+if(hl->usedlines==DEBUGLINE || hl->usedlines==(DEBUGLINE+1)) {

 int i,k;

 int l=hl->lines[hl->usedlines].len;

 linecolor_t *lc=(linecolor_t *) (hl->buf+hl->lines[hl->usedlines].off);