@@ -171,7 +171,6 @@ redata_highlighter_getcolorindex(redata_t *redata, int line, int nthbyte)

 static void

 redata_highlighter_util_applytheme(int *template3,hcolor_t *color,int invert)

 {

-        unsigned char c[3];

         if(template3==NULL || color==NULL || template3[0]<0 || template3[0]>2 || template3[1]<0 || template3[1]>2 || template3[2]<0 || template3[2]>2)

                 return; /* sanity check error */

         if(invert==0) {

@@ -200,7 +199,7 @@ redata_highlighter_settheme(redata_t *redata, int ntheme, int invert)

                 return(-1);

         for(i=0;i<ncolors;i++)

                 redata_highlighter_util_applytheme(permutationtemplate,colors+i,invert);

-        return;

+        return(0);

 }

 static int

@@ -354,6 +353,7 @@ hl_doline(redata_t *redata, highlighter_t *hl, int nline)

                 mode_in_linecomment,

                 mode_in_directive,

                 mode_in_string,

+                mode_in_singlestring,

                 mode_in_directivestring,

         } mode,mlcprevmode;

         if(redata==NULL || hl==NULL || nline<0)

@@ -471,6 +471,11 @@ hl_doline(redata_t *redata, highlighter_t *hl, int nline)

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

                                         continue;

                                 }

+                                if(ptr[i]=='\'') {

+                                        mode=mode_in_singlestring;

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

+                                        continue;

+                                }

                                 if(!cant_define && ptr[i]=='#') {

                                         mode=mode_in_directive;

                                         is_directiveinclude=0;

@@ -592,11 +597,12 @@ hl_doline(redata_t *redata, highlighter_t *hl, int nline)

                                 linecolor=hl_addtolinecolor(&opaque,hl,linecolor,posoffset+i,(is_directiveinclude==0)?color_directivestring:color_directiveincludestring);

                                 continue;

                         }

-                        if(mode==mode_in_string) {

+                        if(mode==mode_in_string || mode_in_singlestring) {

                                 if(prev_char=='\\' || ptr[i]=='\\') {

                                         continue;

                                 }

-                                if(ptr[i]=='\"') {

+                                if((mode==mode_in_string && ptr[i]=='\"')

+                                  || (mode==mode_in_singlestring && ptr[i]=='\'')) {

                                         mode=mode_whatever;

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

                                         continue;