@@ -639,6 +639,8 @@ fprintf(stderr,"SDL_KEYDOWN: fake setup ok\n");

                 int at_end;

                 int nspaces;

                 long cursorpos;

+                long selstart,selend;

+                int fixsel;

                 if(re->ignorenkeys>0) {

                         re->ignorenkeys--;

                         return(0); /* this is an already processed key, ignore it */

@@ -650,6 +652,13 @@ fprintf(stderr,"SDL_TEXTINPUT:\"%s\"\n",event->text.text);

                   || redata_line_realend(re->data,cursorpos,&realend)==-1) {

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

                 }

+                fixsel=0;

+                selstart=selend=0;

+                if(re->selactive

+                  && redata_linecol2pos(re->data,re->sellinefrom,re->selcolfrom,&selstart,NULL)==0

+                  && redata_linecol2pos(re->data,re->sellineto,re->selcolto,&selend,NULL)==0) {

+                        fixsel=1;

+                }

                 at_end=(cursorpos==realend)?1:0;

                 for(nspaces=0;event->text.text[nspaces]==' ';nspaces++)

                         ;

@@ -671,6 +680,12 @@ fprintf(stderr,"SDL_TEXTINPUT:\"%s\"\n",event->text.text);

                 len=strlen(event->text.text);

                 if(redata_op_add(re->data,cursorpos,event->text.text,len,NULL)!=0)

                         return(-1); /* couldn't add requested text */

+                if(fixsel) {

+                        if(cursorpos<=selstart)

+                                redata_pos2linecol(re->data,selstart+len,&(re->sellinefrom),&(re->selcolfrom));

+                        if(cursorpos<=selend)

+                                redata_pos2linecol(re->data,selend+len,&(re->sellineto),&(re->selcolto));

+                }

                 cursorpos+=len;

                 if(event->text.text[0]=='\n' && event->text.text[1]=='\0') {

                         int trimmed;

@@ -777,12 +792,15 @@ fprintf(stderr,"SDL_KEYDOWN: sym:%i\n",event->key.keysym.sym);

                 re->contentsdirty=1;

         } else if(event->key.keysym.sym==SDLK_BACKSPACE && (re->curline>0 || re->curcol>0)) {

                 int line,col;

-                long startpos,newpos,realstart,start;

+                long startpos,delpos,realstart,start;

+                long dellen;

                 char *ptr;

                 int len;

                 int trimmed;

                 int doneinc;

                 long cursorpos;

+                long selstart,selend;

+                int fixsel;

                 if(redata_linecol2pos(re->data,re->curline,re->curcol,&cursorpos,NULL)!=0)

 #if 0

 fprintf(stderr,"SDL_KEYDOWN: BACKSPACE%s\n",(event==&fakeevent)?" (fake)":"");

@@ -797,27 +815,34 @@ fprintf(stderr,"SDL_KEYDOWN: BACKSPACE%s\n",(event==&fakeevent)?" (fake)":"");

                 if(event!=&fakeevent)

                         redata_undo_groupinit(re->data,NULL);

                 /* delete the last character */

+                fixsel=0;

+                selstart=selend=0;

+                if(re->selactive

+                  && redata_linecol2pos(re->data,re->sellinefrom,re->selcolfrom,&selstart,NULL)==0

+                  && redata_linecol2pos(re->data,re->sellineto,re->selcolto,&selend,NULL)==0) {

+                        fixsel=1;

+                }           

                 if(col>0) {

                         if(redata_line_realstart(re->data,cursorpos,&realstart)==-1)

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

                         /* get the start of the part to delete */

                         doneinc=0;

-                        for(ptr=NULL,len=0,start=0,newpos=cursorpos;doneinc!=1;) {

-                                if((newpos-1)<realstart)

+                        for(ptr=NULL,len=0,start=0,delpos=cursorpos;doneinc!=1;) {

+                                if((delpos-1)<realstart)

                                         break;

-                                newpos--;

-                                if(ptr==NULL || (start+len)<=newpos || newpos<start) {

-                                        if(redata_line_rawinfo(re->data,newpos,&start,&ptr,&len,NULL)==-1)

+                                delpos--;

+                                if(ptr==NULL || (start+len)<=delpos || delpos<start) {

+                                        if(redata_line_rawinfo(re->data,delpos,&start,&ptr,&len,NULL)==-1)

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

                                 }

-                                if(redata_generic_utf8isstartbyte(ptr[newpos-start]))

+                                if(redata_generic_utf8isstartbyte(ptr[delpos-start]))

                                         doneinc++;

                         }

                         /* delete */

-                        redata_op_del(re->data,newpos,cursorpos-newpos,NULL);

-                        cursorpos=newpos;

+                        dellen=cursorpos-delpos;

+                        redata_op_del(re->data,delpos,dellen,NULL);

+                        cursorpos=delpos;

                 } else {

-                        long delpos;

                         /* to make the code trivial, we're being lazy on '\n' deletion: we call ...rawinfo() for each byte in the multibyte utf-8 sequence */

                         for(delpos=cursorpos-1

                           ;delpos>0

@@ -825,10 +850,27 @@ fprintf(stderr,"SDL_KEYDOWN: BACKSPACE%s\n",(event==&fakeevent)?" (fake)":"");

                                 if(redata_generic_utf8isstartbyte(ptr[delpos-startpos]))

                                         break;

                         }

-                        redata_op_del(re->data,delpos,cursorpos-delpos,NULL);

+                        dellen=cursorpos-delpos;

+                        redata_op_del(re->data,delpos,dellen,NULL);

                         cursorpos=delpos;

                 }

                 redata_pos2linecol(re->data,cursorpos,&(re->curline),&(re->curcol));

+                if(fixsel) {

+                        if(delpos<=selstart) {

+                                /* if we deleted the start of selection, make the start of selection the cursorpos */

+                                if(selstart>=delpos && selstart<(delpos+dellen))

+                                        redata_pos2linecol(re->data,cursorpos,&(re->sellinefrom),&(re->selcolfrom));

+                                else

+                                        redata_pos2linecol(re->data,selstart-dellen,&(re->sellinefrom),&(re->selcolfrom));

+                        }

+                        if(delpos<=selend) {

+                                /* if we deleted the end of selection, make the start of selection the cursorpos */

+                                if(selend>=delpos && selend<(delpos+dellen))

+                                        redata_pos2linecol(re->data,cursorpos,&(re->sellineto),&(re->selcolto));

+                                else

+                                        redata_pos2linecol(re->data,selend-dellen,&(re->sellineto),&(re->selcolto));

+                        }

+                }

                 /* if cursor at end of line and there are trailing spaces at the end, delete them too */

                 if(re_rtrim(re,cursorpos,&trimmed))

                         cursorpos-=trimmed;