@@ -399,7 +399,6 @@ re_processkey_editing(re_t *re, SDL_Event *event)

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

         /* convert RETURN KEYDOWN to TEXTINPUT */

         if(event->type==SDL_KEYDOWN && event->key.keysym.sym==SDLK_RETURN) {

-#warning file having two \n at the end, delete the second with DEL staying to the right of the first, if we go down then, it does an scroll but it shouldn't

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

                 event=&fakeevent;

                 event->type=SDL_TEXTINPUT;

@@ -413,7 +412,7 @@ re_processkey_editing(re_t *re, SDL_Event *event)

                 strncpy(event->text.text,spaces+(re->curcol%8),sizeof(event->text.text));

                 event->text.text[sizeof(event->text.text)-1]='\0';

         } else if(event->type==SDL_KEYDOWN && event->key.keysym.sym==SDLK_DELETE) {

-#if 0

+#if 1

 fprintf(stderr,"SDL_KEYDOWN: DELETE\n");

 #endif

                 long realend;

@@ -488,6 +487,11 @@ fprintf(stderr,"SDL_TEXTINPUT:\"%s\"\n",event->text.text);

                         int trimmed;

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

                                 re->cursorpos-=trimmed;

+#if 1

+#if 0

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

+#endif

+#endif

                         re->curline++;

                         re->curcol=0;

                 } else {

@@ -732,12 +736,14 @@ re_moveupdown(re_t *re, int totalinc)

         long newpos,newpos2;

         int inc,doneinc;

         long realstart;

+        int needs_inccol;

         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) */

+        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);

@@ -747,16 +753,18 @@ fprintf(stderr,"MOVING from cursorpos:%li line:%i col:%i\n",re->cursorpos,re->cu

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

                 }

                 re->cursorpos=realstart;

+                needs_inccol=1;

                 re->curline+=inc;

-                re_fixorigin(re);

 #if 0

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

 #endif

         }

+        if(!needs_inccol)

+                return(-1);

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

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

 #if 0

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

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

 #endif

                 re->curcol=0;

                 newpos2=newpos;

@@ -768,6 +776,7 @@ fprintf(stderr,"COLUMN from cursorpos:%li line:%i col:%i\n",re->cursorpos,re->cu

 #if 0

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

 #endif

+        re_fixorigin(re);

         re->contentsdirty=1;

         re->headerdirty=1;

         return(0);

@@ -869,13 +878,17 @@ re_rtrim(re_t *re, long curpos, int *trimmed)

                 *trimmed=0;

         if(redata_line_rawinfo(re->data,curpos,&startpos,&start,&len,NULL)==0 &&

            len>1 && start[len-1]=='\n' && start[len-2]==' ' && curpos==(startpos+len-1)) {

-                for(n=1;(n+1)<(len-1) && start[len-1-n-1]==' ';n++)

-                        ;

-#if 0

-fprintf(stderr,"Trying to DELETE SPACES del %i bytes\n",n);

-#endif

-                redata_op_del(re->data,curpos-n,n,NULL);

-                re->cursorpos-=n;

+                /* count the number of spaces at end of line */

+                n=0;

+                while((len-1-n-1)>=0 && start[len-1-n-1]==' ')

+                        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;

         }

@@ -892,7 +905,7 @@ re_drawheader_editing(re_t *re)

                 line=col=-1;

         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",re->filename,re->curline+1,line+1,re->curcol+1,col+1,re->cursorpos);

+        reui_printf(re->ui,0,0,COLOR_STATUSFG,"File: %s Line:%i (%i) Col:%i (%i) Pos:%li Size:%li",re->filename,re->curline+1,line+1,re->curcol+1,col+1,re->cursorpos,redata_getused(re->data));

         re->headerdirty=0;

         re->ui->rendererdirty=1;

         return(0);