@@ -103,10 +103,12 @@ int re_moveleftright(re_t *re, int totalinc);

 int re_changefontsize(re_t *re, int direction);

 int re_sel_setstart(re_t *re, int line, int col);

 int re_sel_setend(re_t *re, int line, int col);

+int re_sel_resize(re_t *re,int oldcol,int oldline,int direction);

 int re_sel_toggle(re_t *re);

 int re_sel_lincolisinside(re_t *re, int line, int col);

 int re_sel_lincolisbefore(re_t *re, int line, int col);

 int re_sel_lincolisafter(re_t *re, int line, int col);

+int re_sel_lincolisend(re_t *re, int line, int col);

 int re_selectbuf_resize(re_t *re,long size);

 int re_selectbuf_fill(re_t *re,long frompos,long size, int nadditionalspaces);

 int re_selectbuf_replace(re_t *re,char *newdata);

@@ -356,7 +358,7 @@ re_free(re_t *re)

         if(re->data!=NULL)

                 redata_free(re->data),re->data=NULL;

         if(re->selectbuf!=NULL)

-                free(re->selectbuf),re->selectbuf=NULL,re->usedselectbuf=re->sizeselectbuf=NULL;

+                free(re->selectbuf),re->selectbuf=NULL,re->usedselectbuf=re->sizeselectbuf=0;

         free(re),re=NULL;

         return;

 }

@@ -547,32 +549,37 @@ fprintf(stderr,"SDL_TEXTEDITING: composition:\"%s\" start:%i len:%i\n",event->ed

 #if 0

 fprintf(stderr,"SDL_KEYDOWN: sym:%i\n",event->key.keysym.sym);

 #endif

-        if(event->key.keysym.sym==SDLK_DOWN || event->key.keysym.sym==SDLK_UP) {

-#warning #error BUG: Played with selections a bit, resized font twice, go down a lot of lines, when after about last line previously displayed it segfaulted

-                int oldcol=re->curline,oldline=re->curcol;

+        if((SDL_GetModState()&KMOD_ALT)!=0 && re->selactive && (event->key.keysym.sym==SDLK_LEFT || event->key.keysym.sym==SDLK_RIGHT)) {

+                int l;

+                int is_del;

+                int tolinefix;

+                long pos,pos2;

+                is_del=(event->key.keysym.sym==SDLK_LEFT)?1:0;

+                redata_undo_groupinit(re->data,NULL);

+                tolinefix=(re->selcolto==0)?1:0;

+                for(l=re->sellinefrom;l<=(re->sellineto-tolinefix);l++) {

+                        if(redata_linecol2pos(re->data,l,0,&pos,NULL)!=0)

+                                continue;

+                        if(is_del==1 && redata_linecol2pos(re->data,l,1,&pos2,NULL)!=0)

+                                continue;

+                        if(!is_del)

+                                redata_op_add(re->data,pos," ",1,NULL);

+                        else if(pos!=pos2)

+                                redata_op_del(re->data,pos,pos2-pos,NULL);

+                }

+                redata_undo_groupcommit(re->data,NULL);

+                redata_linecol2pos(re->data,re->curline,re->curcol,&(re->cursorpos),NULL);

+                re->headerdirty=1;

+                re->contentsdirty=1;

+        } else if(event->key.keysym.sym==SDLK_DOWN || event->key.keysym.sym==SDLK_UP) {

+                int oldcol=re->curcol,oldline=re->curline;

                 if(re_moveupdown(re,(event->key.keysym.sym==SDLK_UP)?-1:1)==0 && (SDL_GetModState()&KMOD_SHIFT)!=0 && (re->curcol!=oldcol || re->curline!=oldline)) {

-                        if(event->key.keysym.sym==SDLK_UP) {

-                                if(re->selactive==0 || re_sel_lincolisafter(re,oldcol,oldline))

-                                        re_sel_setend(re,oldcol,oldline);

-                                re_sel_setstart(re,re->curline,re->curcol);

-                        } else {

-                                if(re->selactive==0 || re_sel_lincolisbefore(re,oldcol,oldline))

-                                        re_sel_setstart(re,oldcol,oldline);

-                                re_sel_setend(re,re->curline,re->curcol);

-                        }

+                        re_sel_resize(re,oldcol,oldline,(event->key.keysym.sym==SDLK_UP)?-1:1);

                 }

         } else if(event->key.keysym.sym==SDLK_LEFT || event->key.keysym.sym==SDLK_RIGHT) {

-                int oldcol=re->curline,oldline=re->curcol;

+                int oldcol=re->curcol,oldline=re->curline;

                 if(re_moveleftright(re,(event->key.keysym.sym==SDLK_LEFT)?-1:1)==0 && (SDL_GetModState()&KMOD_SHIFT)!=0 && (re->curcol!=oldcol || re->curline!=oldline)) {

-                        if(event->key.keysym.sym==SDLK_LEFT) {

-                                if(re->selactive==0 || re_sel_lincolisafter(re,oldcol,oldline))

-                                        re_sel_setend(re,oldcol,oldline);

-                                re_sel_setstart(re,re->curline,re->curcol);

-                        } else {

-                                if(re->selactive==0 || re_sel_lincolisbefore(re,oldcol,oldline))

-                                        re_sel_setstart(re,oldcol,oldline);

-                                re_sel_setend(re,re->curline,re->curcol);

-                        }

+                        re_sel_resize(re,oldcol,oldline,(event->key.keysym.sym==SDLK_LEFT)?-1:1);

                 }

         } else if((SDL_GetModState()&KMOD_CTRL)!=0 && (event->key.keysym.sym==SDLK_PAGEDOWN || event->key.keysym.sym==SDLK_PAGEUP)) {

                 re->cursorpos=(event->key.keysym.sym==SDLK_PAGEDOWN)?(redata_getused(re->data)-1):0;

@@ -702,7 +709,8 @@ fprintf(stderr,"re_processkey(): received Control+'0'\n");

                 re_changefontsize(re, 0);

                 re->ignorenkeys++;

         } else if((event->key.keysym.sym==SDLK_c || event->key.keysym.sym==SDLK_x) && (SDL_GetModState()&KMOD_CTRL)!=0) {

-                long frompos,topos,coldone;

+                long frompos,topos;

+                int coldone;

                 int is_cut=(event->key.keysym.sym==SDLK_x)?1:0;

 fprintf(stderr,"re_processkey(): received Control+%c\n",is_cut?'x':'c');

                 /* CUA92-style copy (ctrl+c) / cut (ctrl+x) */

@@ -782,7 +790,8 @@ re_processkey_commandwait(re_t *re, SDL_Event *event)

                 re->command=NULL;

                 re->headerdirty=1;

         } else if(re->command_first_key=='k' && event->key.keysym.sym==SDLK_y) {

-                long frompos,topos,coldone;

+                long frompos,topos;

+                int coldone;

                 /* wordstar-style blockdel (ctrl+k+y) */

                 if(re->selactive

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

@@ -1163,6 +1172,35 @@ re_sel_setend(re_t *re, int line, int col)

         return(0);

 }

+int

+re_sel_resize(re_t *re,int oldcol,int oldline,int direction)

+{

+        if(re==NULL || oldcol<0 || oldline<0 || (direction!=-1 && direction!=1))

+                return(-1);

+        if(direction==-1) {

+                if(re->selactive==0) {

+                        re_sel_setstart(re,re->curline,re->curcol);

+                        re_sel_setend(re,oldline,oldcol);

+                } else if(re_sel_lincolisafter(re,re->curline,re->curcol) || re_sel_lincolisinside(re,re->curline,re->curcol)) {

+                        re_sel_setend(re,re->curline,re->curcol);

+                } else {

+                        re_sel_setstart(re,re->curline,re->curcol);

+                }

+        } else {

+                if(re->selactive==0 || re_sel_lincolisbefore(re,oldline,oldcol)) {

+                        re_sel_setstart(re,oldline,oldcol);

+                        re_sel_setend(re,re->curline,re->curcol);

+                } else if(re_sel_lincolisinside(re,oldline,oldcol)) {

+                        re_sel_setstart(re,re->curline,re->curcol);

+                } else {

+                        re_sel_setend(re,re->curline,re->curcol);

+                }

+        }

+        if(re->sellinefrom==re->sellineto && re->selcolfrom==re->selcolto)

+                re->selactive=0;

+        return(0);

+}

+

 int

 re_sel_toggle(re_t *re)

 {

@@ -1216,6 +1254,17 @@ re_sel_lincolisafter(re_t *re, int line, int col)

         return(0);

 }

+int

+re_sel_lincolisend(re_t *re, int line, int col)

+{

+        if(re==NULL || line<0 || col<0)

+                return(0);

+        if(line==re->sellineto && col==re->selcolto)

+                return(1);

+        return(0);

+}

+

+

 int

 re_selectbuf_resize(re_t *re,long size)

 {