@@ -57,7 +57,6 @@ typedef struct re_t {

         char filename[PATH_MAX];

         int x, y, w, h; // contents rect

         int fontheightpercent;

-        long cursorpos;

         int originline,origincol;

         int curline,curcol;

         int maxrow,maxcol;

@@ -182,7 +181,6 @@ fprintf(stderr,"QUESTION INIT: %s: %s\n",re->question->title,re->question->body)

                                         re->flag_newfile=0;

                                 re->originline=re->origincol=0;

                                 re->curline=re->curcol=0;

-                                re->cursorpos=0;

                                 load_pending=0;

                                 re->headerdirty=1;

                                 re->contentsdirty=1;

@@ -471,12 +469,15 @@ fprintf(stderr,"SDL_KEYDOWN: DELETE\n");

 #endif

                 long realend;

                 int at_end;

-                if(re->cursorpos==redata_getused(re->data))

+                long cursorpos;

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

+                  || cursorpos==redata_getused(re->data)) {

                         return(0); /* already at end, nothing to delete */

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

+                }

+                if(redata_line_realend(re->data,cursorpos,&realend)==-1)

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

-                at_end=(re->cursorpos==realend)?1:0;

-                if(at_end && (re->cursorpos+1)==redata_getused(re->data))

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

+                if(at_end && (cursorpos+1)==redata_getused(re->data))

                         return(-1); /* we shouldn't erase the final '\n' */

                 memset(&fakeevent,0,sizeof(SDL_Event));

                 event=&fakeevent;

@@ -485,12 +486,10 @@ fprintf(stderr,"SDL_KEYDOWN: DELETE\n");

                 redata_undo_groupinit(re->data,NULL);

                 if(at_end) {

                         int col;

-                        if(redata_pos2linecol(re->data,re->cursorpos,NULL,&col)==-1)

+                        if(redata_pos2linecol(re->data,cursorpos,NULL,&col)==-1)

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

-                        if(redata_op_addn(re->data,re->cursorpos,' ',re->curcol-col,NULL)!=0)

+                        if(redata_op_addn(re->data,cursorpos,' ',re->curcol-col,NULL)!=0)

                                 return(-1); /* couldn't add spaces up to current displayed pos */

-                        re->cursorpos+=re->curcol-col;

-                        re->cursorpos++;

                         re->curline++;

                         re->curcol=0;

                 } else {

@@ -506,6 +505,7 @@ fprintf(stderr,"SDL_KEYDOWN: fake setup ok\n");

                 long realend;

                 int at_end;

                 int nspaces;

+                long cursorpos;

                 if(re->ignorenkeys>0) {

                         re->ignorenkeys--;

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

@@ -513,9 +513,11 @@ fprintf(stderr,"SDL_KEYDOWN: fake setup ok\n");

 #if 0

 fprintf(stderr,"SDL_TEXTINPUT:\"%s\"\n",event->text.text);

 #endif

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

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

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

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

-                at_end=(re->cursorpos==realend)?1:0;

+                }

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

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

                         ;

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

@@ -526,21 +528,21 @@ fprintf(stderr,"SDL_TEXTINPUT:\"%s\"\n",event->text.text);

                 redata_undo_groupinit(re->data,NULL);

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

                         int col;

-                        if(redata_pos2linecol(re->data,re->cursorpos,NULL,&col)==-1)

+                        if(redata_pos2linecol(re->data,cursorpos,NULL,&col)==-1)

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

-                        if(redata_op_addn(re->data,re->cursorpos,' ',re->curcol-col,NULL)!=0)

+                        if(redata_op_addn(re->data,cursorpos,' ',re->curcol-col,NULL)!=0)

                                 return(-1); /* couldn't add spaces up to current displayed pos */

                         /* increment cursorpos; spaces are 1 byte, so the number of columns advanced is the number of bytes advanced */

-                        re->cursorpos+=re->curcol-col;

+                        cursorpos+=re->curcol-col;

                 }

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

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

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

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

-                re->cursorpos+=len;

+                cursorpos+=len;

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

                         int trimmed;

-                        if(re_rtrim(re,re->cursorpos-len,&trimmed))

-                                re->cursorpos-=trimmed;

+                        if(re_rtrim(re,cursorpos-len,&trimmed))

+                                cursorpos-=trimmed;

 #if 1

 #if 0

 fprintf(stderr,"SDL_TEXTINPUT: Insering newline\n");

@@ -587,7 +589,6 @@ fprintf(stderr,"SDL_KEYDOWN: sym:%i\n",event->key.keysym.sym);

                                 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) {

@@ -601,9 +602,10 @@ fprintf(stderr,"SDL_KEYDOWN: sym:%i\n",event->key.keysym.sym);

                         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;

-                re->cursorpos=(re->cursorpos<0)?0:re->cursorpos;

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

+                long cursorpos;

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

+                cursorpos=(cursorpos<0)?0:cursorpos;

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

                 re_fixorigin_center(re);

                 re->headerdirty=1;

                 re->contentsdirty=1;

@@ -611,27 +613,33 @@ fprintf(stderr,"SDL_KEYDOWN: sym:%i\n",event->key.keysym.sym);

                 re_moveupdown(re,(event->key.keysym.sym==SDLK_PAGEUP)?-(re->maxrow):re->maxrow);

         } else if(event->key.keysym.sym==SDLK_HOME || event->key.keysym.sym==SDLK_END) {

                 long newpos;

-                if((event->key.keysym.sym==SDLK_HOME && redata_line_realstart(re->data,re->cursorpos,&newpos)==-1)

-                  || (event->key.keysym.sym==SDLK_END && redata_line_realend(re->data,re->cursorpos,&newpos)==-1)) {

+                long cursorpos;

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

+                        return(0); /* error obtaining position */

+                if((event->key.keysym.sym==SDLK_HOME && redata_line_realstart(re->data,cursorpos,&newpos)==-1)

+                  || (event->key.keysym.sym==SDLK_END && redata_line_realend(re->data,cursorpos,&newpos)==-1)) {

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

                 }

-                re->cursorpos=newpos;

-                if(redata_pos2linecol(re->data,re->cursorpos,NULL,&(re->curcol))==-1)

+                cursorpos=newpos;

+                if(redata_pos2linecol(re->data,cursorpos,NULL,&(re->curcol))==-1)

                         return(-1); /* couldn't get col of current pos */;

                 re_fixorigin(re);

                 re->headerdirty=1;

                 re->contentsdirty=1;

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

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

                 int line,col;

                 long startpos,newpos,realstart,start;

                 char *ptr;

                 int len;

                 int trimmed;

                 int doneinc;

+                long cursorpos;

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

 #if 0

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

 #endif

-                if(redata_pos2linecol(re->data,re->cursorpos,&line,&col)==-1)

+                        return(0); /* error obtaining position */

+                if(redata_pos2linecol(re->data,cursorpos,&line,&col)==-1)

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

                 if(col<re->curcol) {

                         re_moveleftright(re,-1);

@@ -641,11 +649,11 @@ fprintf(stderr,"SDL_KEYDOWN: BACKSPACE%s\n",(event==&fakeevent)?" (fake)":"");

                         redata_undo_groupinit(re->data,NULL);

                 /* delete the last character */

                 if(col>0) {

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

+                        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=re->cursorpos;doneinc!=1;) {

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

                                 if((newpos-1)<realstart)

                                         break;

                                 newpos--;

@@ -657,24 +665,24 @@ fprintf(stderr,"SDL_KEYDOWN: BACKSPACE%s\n",(event==&fakeevent)?" (fake)":"");

                                         doneinc++;

                         }

                         /* delete */

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

-                        re->cursorpos=newpos;

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

+                        cursorpos=newpos;

                 } 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=re->cursorpos-1

+                        for(delpos=cursorpos-1

                           ;delpos>0

                           && redata_line_rawinfo(re->data,delpos,&startpos,&ptr,&len,NULL)==0;) {

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

                                         break;

                         }

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

-                        re->cursorpos=delpos;

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

+                        cursorpos=delpos;

                 }

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

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

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

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

-                        re->cursorpos-=trimmed;

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

+                        cursorpos-=trimmed;

                 /* end of deletion */

                 redata_undo_groupcommit(re->data,NULL);

                 re->headerdirty=1;

@@ -699,23 +707,25 @@ fprintf(stderr,"SDL_KEYDOWN: BACKSPACE%s\n",(event==&fakeevent)?" (fake)":"");

                 long newpos;

                 if(redata_op_undo(re->data,&newpos))

                         return(-1);

-                re->cursorpos=newpos;

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

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

                 re_fixorigin(re);

                 re->headerdirty=1;

                 re->contentsdirty=1;

         } else if(event->key.keysym.sym==SDLK_l && (SDL_GetModState()&KMOD_CTRL)!=0 && re->cachelastsearch[0]!='\0') {

                 long newpos;

+                long cursorpos;

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

+                        return(-1); /* error obtaining position */

                 /* search next (forward) */

-                if((newpos=redata_searchforward(re->data,re->cursorpos+1,re->cachelastsearch,strlen(re->cachelastsearch)))==-1) {

+                if((newpos=redata_searchforward(re->data,cursorpos+1,re->cachelastsearch,strlen(re->cachelastsearch)))==-1) {

                         re->command=COMMAND_WARNING;

                         snprintf(re->commandbuf,sizeof(re->commandbuf),"String not found");

                         re->commandbuf[sizeof(re->commandbuf)-1]='\0';

                         re->headerdirty=1;

                         return(-1);

                 }

-                re->cursorpos=newpos;

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

+                cursorpos=newpos;

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

                 re_fixorigin_center(re);

                 re->headerdirty=1;

                 re->contentsdirty=1;

@@ -742,8 +752,7 @@ fprintf(stderr,"SDL_KEYDOWN: BACKSPACE%s\n",(event==&fakeevent)?" (fake)":"");

                                 redata_undo_groupinit(re->data,NULL);

                                 redata_op_del(re->data,frompos,topos-frompos,NULL);

                                 redata_undo_groupcommit(re->data,NULL);

-                                re->cursorpos=frompos;

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

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

                                 re_fixorigin(re);

                                 re->headerdirty=1;

                         }

@@ -752,18 +761,20 @@ fprintf(stderr,"SDL_KEYDOWN: BACKSPACE%s\n",(event==&fakeevent)?" (fake)":"");

                 }

                 re->ignorenkeys++;

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

-fprintf(stderr,"re_processkey(): received Control+v\n");

+                long cursorpos;

                 /* Mac-HIG/OpenLook-style paste (ctrl+v)*/

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

+                        return(-1); /* error obtaining position */

                 if(re->selactive)

                         re_sel_toggle(re);

                 if(SDL_HasClipboardText())

                         re_selectbuf_replace(re,SDL_GetClipboardText());

                 if(re->usedselectbuf>0) {

                         redata_undo_groupinit(re->data,NULL);

-                        redata_op_add(re->data,re->cursorpos,re->selectbuf,re->usedselectbuf,NULL);

+                        redata_op_add(re->data,cursorpos,re->selectbuf,re->usedselectbuf,NULL);

                         redata_undo_groupcommit(re->data,NULL);

-                        re->cursorpos+=re->usedselectbuf;

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

+                        cursorpos+=re->usedselectbuf;

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

                         re_fixorigin(re);

                         re->headerdirty=1;

                         re->contentsdirty=1;

@@ -815,7 +826,10 @@ re_processkey_commandwait(re_t *re, SDL_Event *event)

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

                 long frompos,topos;

                 int coldone;

+                long cursorpos;

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

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

+                        return(-1); /* error obtaining position */

                 if(re->selactive

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

                   && redata_linecol2pos(re->data,re->sellineto,re->selcolto,&topos,&coldone)==0) {

@@ -823,9 +837,9 @@ re_processkey_commandwait(re_t *re, SDL_Event *event)

                         redata_undo_groupinit(re->data,NULL);

                         redata_op_del(re->data,frompos,topos-frompos,NULL);

                         redata_undo_groupcommit(re->data,NULL);

-                        if(re->cursorpos>frompos) {

-                                re->cursorpos=frompos;

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

+                        if(cursorpos>frompos) {

+                                cursorpos=frompos;

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

                                 re_fixorigin(re);

                         }

                         re->headerdirty=1;

@@ -857,17 +871,19 @@ re_processkey_commandwait(re_t *re, SDL_Event *event)

                                 insertpos+=re->curcol-coldone;

                         }

                         if(is_move) {

+                                long cursorpos;

                                 redata_op_del(re->data,frompos,re->usedselectbuf,NULL);

                                 redata_op_add(re->data,insertpos-((insertpos>frompos)?re->usedselectbuf:0),re->selectbuf,re->usedselectbuf,NULL);

-                                re->cursorpos=insertpos-((insertpos>frompos)?re->usedselectbuf:0)+re->usedselectbuf;

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

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

+                                cursorpos=insertpos-((insertpos>frompos)?re->usedselectbuf:0)+re->usedselectbuf;

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

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

                                 re->sellineto=re->curline;

                                 re->selcolto=re->curcol;

                         } else {

+                                long cursorpos;

                                 redata_op_add(re->data,insertpos,re->selectbuf,re->usedselectbuf,NULL);

-                                re->cursorpos=insertpos+re->usedselectbuf;

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

+                                cursorpos=insertpos+re->usedselectbuf;

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

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

                                 re->sellineto=re->curline;

                                 re->selcolto=re->curcol;

@@ -948,7 +964,6 @@ re_processcommand(re_t *re)

                         re->headerdirty=1;

                         return(-1);

                 }

-                re->cursorpos=pos;

                 re->curline=line;

                 /* position the line in the center of viewport */

                 re->originline=line-(re->maxrow/2);

@@ -956,7 +971,10 @@ re_processcommand(re_t *re)

                 re->contentsdirty=1;

         } else if(strcmp(re->command,COMMAND_SEARCHFORWARD)==0) {

                 long newpos;

-                if((newpos=redata_searchforward(re->data,re->cursorpos,re->commandbuf,strlen(re->commandbuf)))==-1) {

+                long cursorpos;

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

+                        return(-1); /* error obtaining position */

+                if((newpos=redata_searchforward(re->data,cursorpos,re->commandbuf,strlen(re->commandbuf)))==-1) {

                         re->command=COMMAND_WARNING;

                         snprintf(re->commandbuf,sizeof(re->commandbuf),"String not found");

                         re->commandbuf[sizeof(re->commandbuf)-1]='\0';

@@ -965,8 +983,8 @@ re_processcommand(re_t *re)

                 }

                 strncpy(re->cachelastsearch,re->commandbuf,sizeof(re->cachelastsearch));

                 re->cachelastsearch[sizeof(re->cachelastsearch)-1]='\0';

-                re->cursorpos=newpos;

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

+                cursorpos=newpos;

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

                 re_fixorigin_center(re);

                 re->headerdirty=1;

                 re->contentsdirty=1;

@@ -1027,8 +1045,7 @@ re_processcommand(re_t *re)

                         redata_op_add(re->data,newpos,re->cachelastreplacewith,rlen,NULL);

                 }

                 redata_undo_groupcommit(re->data,NULL);

-                re->cursorpos=oldpos;

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

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

                 re_fixorigin_center(re);

                 re->headerdirty=1;

                 re->contentsdirty=1;

@@ -1061,31 +1078,34 @@ re_moveupdown(re_t *re, int totalinc)

         int inc,doneinc;

         long realstart;

         int needs_inccol;

+        long cursorpos;

         if(re==NULL)

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

         if(totalinc==0)

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

         inc=(totalinc<0)?-1:1;

-        newpos=re->cursorpos; /* get rid of compiler warning (will be overwitten in the loop as totalinc never is 0) */

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

+                return(-1); /* error obtaining position */

+        newpos=cursorpos; /* get rid of compiler warning (will be overwitten in the loop as totalinc never is 0) */

         needs_inccol=0;

         for(doneinc=0;doneinc!=totalinc;doneinc+=inc) {

 #if 0

-fprintf(stderr,"MOVING from cursorpos:%li line:%i col:%i\n",re->cursorpos,re->curline,re->curcol);

+fprintf(stderr,"MOVING from cursorpos:%li line:%i col:%i\n",cursorpos,re->curline,re->curcol);

 #endif

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

-                   || (inc==1 && redata_line_nextrealstart(re->data,re->cursorpos,&realstart)==-1)) {

+                if((inc==-1 && redata_line_prevrealstart(re->data,cursorpos,&realstart)==-1)

+                   || (inc==1 && redata_line_nextrealstart(re->data,cursorpos,&realstart)==-1)) {

                         break; /* couldn't get current line data, we are at start/end */

                 }

-                re->cursorpos=realstart;

+                cursorpos=realstart;

                 needs_inccol=1;

                 re->curline+=inc;

 #if 0

-fprintf(stderr,"MOVING   to cursorpos:%li line:%i col:%i\n",re->cursorpos,re->curline,re->curcol);

+fprintf(stderr,"MOVING   to cursorpos:%li line:%i col:%i\n",cursorpos,re->curline,re->curcol);

 #endif

         }

         if(!needs_inccol)

                 return(-1);

-        if(redata_line_inccol(re->data,re->cursorpos,re->curcol,&newpos2,NULL)==-1) {

+        if(redata_line_inccol(re->data,cursorpos,re->curcol,&newpos2,NULL)==-1) {

                 /* error advancing cursor, "emergency" repositioning */

 #if 0

 fprintf(stderr,"SETTING COLUMN ERROR\n");

@@ -1094,11 +1114,11 @@ fprintf(stderr,"SETTING COLUMN ERROR\n");

                 newpos2=newpos;

         }

 #if 0

-fprintf(stderr,"COLUMN from cursorpos:%li line:%i col:%i\n",re->cursorpos,re->curline,re->curcol);

+fprintf(stderr,"COLUMN from cursorpos:%li line:%i col:%i\n",cursorpos,re->curline,re->curcol);

 #endif

-        re->cursorpos=newpos2;

+        cursorpos=newpos2;

 #if 0

-fprintf(stderr,"COLUMN   to cursorpos:%li line:%i col:%i\n",re->cursorpos,re->curline,re->curcol);

+fprintf(stderr,"COLUMN   to cursorpos:%li line:%i col:%i\n",cursorpos,re->curline,re->curcol);

 #endif

         re_fixorigin(re);

         re->contentsdirty=1;

@@ -1115,30 +1135,33 @@ re_moveleftright(re_t *re, int totalinc)

         int len;

         long start;

         int tmpcol,oldcol;

+        long cursorpos;

         if(re==NULL)

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

         if(totalinc==0)

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

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

+                return(-1); /* error obtaining position */

         oldcol=re->curcol;

         if(totalinc<0 && (re->curcol+totalinc)<=0) {

                 /* we'll land on the start of the line -- do it trivially */

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

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

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

                 re->curcol=0;

-                re->cursorpos=realstart;

+                cursorpos=realstart;

         } else {

                 /* move a char at a time */

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

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

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

                 inc=(totalinc<0)?-1:1;

                 doneinc=0;

-                if(redata_pos2linecol(re->data,re->cursorpos,NULL,&tmpcol)==-1)

+                if(redata_pos2linecol(re->data,cursorpos,NULL,&tmpcol)==-1)

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

                 /* special case: we're just over the '\n' going right, we have to move 1 to enable the generic case to work */

                 if(tmpcol==re->curcol && inc>0) {

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

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

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

-                        if(ptr[re->cursorpos-start]=='\n') {

+                        if(ptr[cursorpos-start]=='\n') {

                                 tmpcol++;

                                 totalinc--;

                                 re->curcol++;

@@ -1155,7 +1178,7 @@ re_moveleftright(re_t *re, int totalinc)

                         }

                 }

                 /* generic case: move one char at a time */

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

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

                         if((newpos+inc)<realstart)

                                 break;

                         newpos+=inc;

@@ -1168,7 +1191,7 @@ re_moveleftright(re_t *re, int totalinc)

                         if(ptr[newpos-start]=='\n')

                                 break;

                 }

-                re->cursorpos=newpos;

+                cursorpos=newpos;

                 re->curcol+=doneinc;

                 if(inc>0 && doneinc<totalinc && ptr!=NULL && ptr[newpos-start]=='\n')

                         re->curcol+=(totalinc-doneinc);

@@ -1440,11 +1463,6 @@ re_rtrim(re_t *re, long curpos, int *trimmed)

                         n++;

                 /* delete the counted number of spaces at end of line */

                 redata_op_del(re->data,startpos+len-1-n,n,NULL);

-                /* fix cursorpos if it is after the deleted characters or over one of the deleted characters */

-                if(re->cursorpos>=(startpos+len-1))

-                        re->cursorpos-=n;

-                else if(re->cursorpos>=(startpos+len-1-n))

-                        re->cursorpos=(startpos+len-1-n);

                 if(trimmed!=NULL)

                         *trimmed=n;

         }

@@ -1518,15 +1536,15 @@ re_getmatchingbracket(re_t *re,long posini, char originalchar, char *matchingcha

 int

 re_drawheader_editing(re_t *re)

 {

-        int line,col;

+        long cursorpos;

         if(re==NULL)

                 return(-1);

-        if(redata_pos2linecol(re->data,re->cursorpos,&line,&col)==-1)

-                line=col=-1;

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

+                return(0); /* error obtaining position */

         reui_fill(re->ui,0,0,re->ui->w,re->ui->fontheight,COLOR_STATUSBG);

         /* for the user, lines start at 0 (internally they start at 0) */

-        reui_printf(re->ui,0,0,COLOR_STATUSFG,"File: %s Line:%i (%i) Col:%i (%i) Pos:%li Size:%li %s"

-          ,re->filename,re->curline+1,line+1,re->curcol+1,col+1,re->cursorpos,redata_getused(re->data)

+        reui_printf(re->ui,0,0,COLOR_STATUSFG,"File: %s Line:%i Col:%i Pos:%li Size:%li %s"

+          ,re->filename,re->curline+1,re->curcol+1,cursorpos,redata_getused(re->data)

           ,"");

 #warning #error MAKE THE PREVIOUS LINE LAST %s print: "CHANGED" when unsaved&not-in-reu, "changed" when unsaved but is in reu, "saved" when it is saved.

         re->headerdirty=0;

@@ -1595,11 +1613,14 @@ re_drawcontents(re_t *re)

         int matchingpos;

         char matchingchar;

         int mline,mcol;

+        long cursorpos;

         const char *hint;

         const char selcolornormal[]={"\xde\xcf\x7f\xff"};

         const char selcolorcurline[]={"\xf0\xea\xc9\xff"};

         if(re==NULL)

                 return(-1);

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

+                return(0); /* error obtaining position */

 #if 0

 fprintf(stderr,"re_drawcontents: pre  reuifill1\n");

 #endif

@@ -1608,7 +1629,7 @@ fprintf(stderr,"re_drawcontents: pre  reuifill1\n");

 fprintf(stderr,"re_drawcontents: post reuifill1\n");

 #endif

         row=re->curline-re->originline;

-        pos=re->cursorpos;

+        pos=cursorpos;

         while(row>0 && pos>0) {

                 if(redata_line_rawinfo(re->data,pos,&newpos,NULL,NULL,&is_continuation)==-1)

                         return(-1);

@@ -1719,7 +1740,7 @@ fprintf(stderr,"\n");

                                         reui_write(re->ui,re->x+re->ui->fontwidth*(re->curcol-re->origincol),y,"\xff\xff\xff\xff",curptr,utf8charlen);

                                         /* get matching braces/parens/anglebracket/curlybraces for highlighting */

                                         if(utf8charlen==1 && strchr("[]{}<>()",*curptr)!=NULL)

-                                                matchingpos=re_getmatchingbracket(re,re->cursorpos,*curptr,&matchingchar);

+                                                matchingpos=re_getmatchingbracket(re,cursorpos,*curptr,&matchingchar);

                                 }

                         }

                 }

@@ -1751,7 +1772,7 @@ fprintf(stderr,"\n");

                         reui_balloon(re->ui, '\0', x,y, fg, bg, &matchingchar,1);

         }

         /* display prototypes info if applicable */

-        hint=redata_prototypes_get(re->data, re->cursorpos);

+        hint=redata_prototypes_get(re->data, cursorpos);

         if(hint!=NULL) {

                 if((re->curline-re->originline)>=(re->maxrow/2))

                         reui_balloon(re->ui, '\0', re->x+re->w/2, re->y+re->ui->fontheight*3/2, "\x80\x80\x80\xff", "\xff\xff\xff\xcf",(char *) hint,strlen(hint));