@@ -1152,46 +1152,58 @@ redata_op_move(redata_t *redata, long posorig, long size, long posdest, undostac

 }

 int

-redata_op_undo(redata_t *redata)

+redata_op_undo(redata_t *redata, long *newcursorpos)

 {

         undo_t *undo;

+        long newpos=0;

         if(redata==NULL

           || redata->undostack.usedundo<1)

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

         undo=redata->undostack.undo+redata->undostack.usedundo-1;

         if(undo->type=='A') { /* ADD */

+                newpos=undo->posorig;

                 redata_op_del(redata,undo->posorig,undo->len,&(redata->undostack));

         } else if(undo->type=='D') { /* DEL */

+                newpos=undo->posorig+undo->len;

                 redata_op_add(redata,undo->posorig,redata->undostack.buf+undo->off,undo->len,&(redata->undostack));

         } else if(undo->type=='M') { /* MOVE */

+                newpos=undo->posorig+undo->len;

                 if(undo->posorig<undo->posdest)

                         redata_op_move(redata,undo->posdest-undo->len, undo->len, undo->posorig,&(redata->undostack));

                 else

                         redata_op_move(redata,undo->posdest, undo->len, undo->posorig+undo->len,&(redata->undostack));

         } else

                 return(-1); /* unknown operation */

+        if(newcursorpos!=NULL)

+                *newcursorpos=newpos;

 #warning TODO: Is it neccessary to do an unadd to the plugins?

-        return(-1);

+        return(0);

 }

 int

-redata_op_redo(redata_t *redata)

+redata_op_redo(redata_t *redata, long *newcursorpos)

 {

         undo_t *undo;

+        long newpos;

         if(redata==NULL

           || redata->redostack.usedundo<1)

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

         undo=redata->redostack.undo+redata->redostack.usedundo-1;

         if(undo->type=='A') { /* ADD */

+                newpos=undo->posorig+undo->len;

                 redata_op_add(redata,undo->posorig,redata->redostack.buf+undo->off,undo->len,&(redata->redostack));

         } else if(undo->type=='D') { /* DEL */

+                newpos=undo->posorig;

                 redata_op_del(redata,undo->posorig,undo->len,&(redata->redostack));

         } else if(undo->type=='M') { /* MOVE */

+                newpos=undo->posorig+undo->len;

                 redata_op_move(redata,undo->posorig, undo->len, undo->posdest,&(redata->redostack));

         } else

                 return(-1); /* unknown operation */

 #warning TODO: Is it neccessary to do an unadd to the plugins?

-        return(-1);

+        if(newcursorpos!=NULL)

+                *newcursorpos=newpos;

+        return(0);

 }

 int

@@ -1679,7 +1691,7 @@ redata_pos2linecol(redata_t *redata, long pos, int *resline, int *rescol)

 int

 redata_linecol2pos(redata_t *redata, int line, int colrequest, long *pos, int *coldone)

 {

-        long chunkpos,realstart,newpos,curpos,startpos;

+        long chunkpos,realstart,curpos,startpos;

         int startline;

         int nchunk;

         rechunk_t *chunk;

@@ -126,8 +126,8 @@ int redata_op_add(redata_t *redata, long pos, char *buf, long buflen, undostack_

 int redata_op_addn(redata_t *redata, long pos, char character, long n, undostack_t *fromhere);

 int redata_op_del(redata_t *redata, long pos, long size, undostack_t *fromhere);

 int redata_op_move(redata_t *redata, long posorig, long size, long posdest, undostack_t *fromhere);

-int redata_op_undo(redata_t *redata);

-int redata_op_redo(redata_t *redata);

+int redata_op_undo(redata_t *redata, long *newcursorpos);

+int redata_op_redo(redata_t *redata, long *newcursorpos);

 int redata_data_compare(redata_t *redata, long pos, char *buf, long buflen);

@@ -329,7 +329,7 @@ if(k!=0) redata_save(redata,"test.post");

                                         errorbuf[sizeof(errorbuf)-1]='\0';

                                         return(errorbuf);

                                 }

-                                redata_op_undo(redata);

+                                redata_op_undo(redata,NULL);

 redata_save(redata,"test.undo");

                                 redata_hash(redata,hash129_redata);

                                 if(strcmp(hash129_redata,hash129_memold)!=0) {

@@ -340,7 +340,7 @@ redata_save(redata,"test.undo");

                                         errorbuf[sizeof(errorbuf)-1]='\0';

                                         return(errorbuf);

                                 }

-                                redata_op_redo(redata);

+                                redata_op_redo(redata,NULL);

 redata_save(redata,"test.redo");

                                 redata_hash(redata,hash129_redata);

                                 if(strcmp(hash129_redata,hash129_mem)!=0) {

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

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

                 re->command="";

                 re->headerdirty=1;

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

+                long newpos;

+                int oldline;

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

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

+                        return(-1);

+                re->cursorpos=newpos;

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

+                if(re->curline<re->originline || re->curline>=(re->originline+re->maxrow)) {

+                        re->originline=re->curline-(re->maxrow/2);

+                        re->originline=(re->originline<0)?0:re->originline;

+                }

+                re->origincol=(re->curcol>(re->maxcol-COLFORCESCROLL))?(re->curcol-(re->maxcol-COLFORCESCROLL)):0;

+                re->headerdirty=1;

+                re->contentsdirty=1;

         }

         return(0);

 }