@@ -507,7 +507,8 @@ redata_unsaved_commit(redata_t *redata, redata_plugin_t *slot,char *filename)

         if(redata==NULL || slot==NULL || unsaved==NULL || unsaved->unsavedfd==-1)

                 return(-1);

 #if 1

-fprintf(stderr,"UNSAVED_COMMITTED\n");

+if(unsaved->usedbuf>0)

+        fprintf(stderr,"UNSAVED_COMMITTED\n");

 #endif

         for(nwritten=0;nwritten<unsaved->usedbuf;nwritten+=n) {

                 if((n=write(unsaved->unsavedfd,unsaved->buf+nwritten,unsaved->usedbuf-nwritten))<0) {

@@ -295,22 +295,63 @@ re_setfilename(re_t *re, char *filename)

 int

 re_processkey_editing(re_t *re, SDL_Event *event)

 {

-        SDL_Event returnevent;

+        SDL_Event fakeevent;

         if(re==NULL || event==NULL)

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

         /* convert RETURN KEYDOWN to TEXTINPUT */

+#warning XXX TODO: If the "\n" of end-of-file is deleted using DEL, the editor bugs

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

-                memset(&returnevent,0,sizeof(SDL_Event));

-                event=&returnevent;

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

+                event=&fakeevent;

                 event->type=SDL_TEXTINPUT;

                 strncpy(event->text.text,"\n",sizeof(event->text.text));

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

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

+                static char spaces[8]={"        "};

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

+                event=&fakeevent;

+                event->type=SDL_TEXTINPUT;

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

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

+#endif

+                long realend;

+                int at_end;

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

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

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

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

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

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

+                event=&fakeevent;

+                event->type=SDL_KEYDOWN;

+                event->key.keysym.sym=SDLK_BACKSPACE;

+                redata_undo_groupinit(re->data,NULL);

+                if(at_end) {

+                        int col;

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

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

+                        if(redata_op_addn(re->data,re->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 {

+                        re_moveleftright(re,1);

+                }

+#if 1

+fprintf(stderr,"SDL_KEYDOWN: fake setup ok\n");

+#endif

         }

         /* special case: text editing event */

         if(event->type==SDL_TEXTINPUT) {

                 int len;

                 long realend;

                 int at_end;

+                int nspaces;

                 if(re->ignorenkeys>0) {

                         re->ignorenkeys--;

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

@@ -321,13 +362,15 @@ fprintf(stderr,"SDL_TEXTINPUT:\"%s\"\n",event->text.text);

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

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

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

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

-                        /* instead of adding a space at the end of the line, we move the cursor to the right */

-                        re_moveleftright(re,1);

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

+                        ;

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

+                        /* instead of adding spaces at the end of the line, we move the cursor to the right */

+                        re_moveleftright(re,nspaces);

                         return(0); /* no need to add spaces at the end of the line */

                 }

                 redata_undo_groupinit(re->data,NULL);

-                if(event!=&returnevent && at_end) {

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

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

@@ -340,7 +383,7 @@ fprintf(stderr,"SDL_TEXTINPUT:\"%s\"\n",event->text.text);

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

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

                 re->cursorpos+=len;

-                if(event==&returnevent) {

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

                         int trimmed;

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

                                 re->cursorpos-=trimmed;

@@ -363,7 +406,7 @@ fprintf(stderr,"SDL_TEXTEDITING: composition:\"%s\" start:%i len:%i\n",event->ed

         /* default case: keydown event */

         if(event->type!=SDL_KEYDOWN)

                 return(0); /* Ignore other possible events */

-#if 0

+#if 1

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

@@ -398,13 +441,17 @@ fprintf(stderr,"SDL_KEYDOWN: sym:%i\n",event->key.keysym.sym);

                 int len;

                 int trimmed;

                 int doneinc;

+#if 0

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

+#endif

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

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

                 if(col<re->curcol) {

                         re_moveleftright(re,-1);

                         return(0); /* were hovering to the right of last char, only had to move left */

                 }

-                redata_undo_groupinit(re->data,NULL);

+                if(event!=&fakeevent)

+                        redata_undo_groupinit(re->data,NULL);

                 /* delete the last character */

                 if(col>0) {

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

@@ -846,7 +893,7 @@ re_drawcontents(re_t *re)

                                         drawn_cursor=1;

                                         curptr=redata_generic_utf8col(ptr,len-has_nl,re->curcol-tmpcol);

                                         curptrlen=(curptr==NULL)?0:(len-has_nl)-(curptr-ptr);

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

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

                                 }

 #warning TODO: if it is one of  '[','{','<','>','}',']', highlight the matching bracket/parens/anglebracket.

                         }