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

                 re->headerdirty=1;

                 re->contentsdirty=1;

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

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

                 re->command="";

                 re->command_first_key='q';

                 re->headerdirty=1;

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

+                char *errormsg=NULL;

+                if(redata_save(re->data,re->filename,&errormsg)!=-1)

+                        errormsg="File saved";

+                re->command=COMMAND_WARNING;

+                snprintf(re->commandbuf,sizeof(re->commandbuf),errormsg);

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

+                re->headerdirty=1;

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

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

                 re->command="";

                 re->command_first_key='k';

                 re->headerdirty=1;

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

                 long newpos;

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

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

                         return(-1);

                 re->cursorpos=newpos;

@@ -701,7 +706,6 @@ fprintf(stderr,"re_processkey(): received Control+z\n");

                 re->contentsdirty=1;

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

                 long newpos;

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

                 /* search next (forward) */

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

                         re->command=COMMAND_WARNING;

@@ -716,23 +720,19 @@ fprintf(stderr,"re_processkey(): received Control+l\n");

                 re->headerdirty=1;

                 re->contentsdirty=1;

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

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

                 re_changefontsize(re, 1);

                 re->ignorenkeys++;

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

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

                 re_changefontsize(re, -1);

                 re->ignorenkeys++;

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

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

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

+                /* Mac-HIG/OpenLook-style copy (ctrl+c) / cut (ctrl+x) */

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

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

                 re->ignorenkeys++;

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

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

-                /* CUA92-style paste (ctrl+v)*/

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

                 if(re->selactive)

                         re_sel_toggle(re);

                 if(SDL_HasClipboardText())

@@ -1023,16 +1023,10 @@ re_processcommand(re_t *re)

                   ;(oldpos+slen)<endpos && (newpos=redata_searchforward(re->data,oldpos,re->cachelastsearch,slen))!=-1

                     && (newpos+slen)<=endpos

                   ;total++,oldpos=newpos+rlen) {

-#if 1

-fprintf(stderr,"substituting %i bytes for %i bytes ar position:%li\n",slen,rlen,newpos);

-#endif

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

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

                 }

                 redata_undo_groupcommit(re->data,NULL);

-#if 1

-fprintf(stderr,"oldpos:%li\n",oldpos);

-#endif

                 re->cursorpos=oldpos;

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

                 re_fixorigin_center(re);

@@ -1531,7 +1525,10 @@ 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 Size:%li",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 (%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)

+          ,"");

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

         re->ui->rendererdirty=1;

         return(0);