@@ -873,20 +873,31 @@ redata_op_undo(redata_t *redata)

         } else if(strcmp(undo->type,"DEL")==0) {

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

         } else if(strcmp(undo->type,"MOV")==0) {

-#warning TODO

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

- #warning TODO

         return(-1);

 }

 int

 redata_op_redo(redata_t *redata)

 {

+        undo_t *undo;

         if(redata==NULL

           || redata->redostack.usedundo<1)

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

-#warning TODO

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

+        if(strcmp(undo->type,"ADD")==0) {

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

+        } else if(strcmp(undo->type,"DEL")==0) {

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

+        } else if(strcmp(undo->type,"MOV")==0) {

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

+        } else

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

         return(-1);

 }