@@ -517,7 +517,7 @@ hl_doline(redata_t *redata, highlighter_t *hl, int nline)

                                 if(prev_char=='/' && ptr[i]=='/') {

                                         mode=mode_in_linecomment;

                                         linecolor=hl_addtolinecolor(&opaque,hl,linecolor,posoffset+i-1,color_linecomment);

-                                         linecolor=hl_addtolinecolor(&opaque,hl,linecolor,posoffset+i,color_linecomment);

+                                        linecolor=hl_addtolinecolor(&opaque,hl,linecolor,posoffset+i,color_linecomment);

                                         continue;

                                 }

                                 if(prev_char=='/' && ptr[i]=='*') {

@@ -704,6 +704,7 @@ hl_C_getdirectives(char ***directives,int *ndirectives, int *maxlen)

 "line",

 "error",

 "pragma",

+NULL

 };

         if(directives==NULL || ndirectives==NULL)

                 return(-1);

@@ -767,6 +768,7 @@ hl_addtolinecolor(int *opaque, highlighter_t *hl,linecolor_t *linecolor,int poso

                 linecolor->len=1;

                 linecolor->color=color;

                 *opaque=1;

+                hl->usedbuf=line->off+line->len;

                 return(linecolor);

         }

         /* if posoff was already done, truncate */

@@ -800,7 +802,7 @@ hl_addtolinecolor(int *opaque, highlighter_t *hl,linecolor_t *linecolor,int poso

         linecolor->color=color;

         *opaque+=1;

         line->len+=sizeof(linecolor_t);

-        hl->usedbuf+=sizeof(linecolor_t);

+        hl->usedbuf=line->off+line->len;

         return(linecolor);

 }