@@ -1039,8 +1039,12 @@ redata_op_add(redata_t *redata, long insertpos, char *buf, long buflen, undostac

         }

         /* add to plugins (unsaved,...) */

         for(i=0;i<redata->sizeplugins;i++) {

-                if(redata->plugins[i].add!=NULL)

-                        redata->plugins[i].add(redata,redata->plugins+i,redata->undostack.undo+redata->undostack.usedundo-1);

+                if(redata->plugins[i].add_or_unadd!=NULL) {

+                        redata->plugins[i].add_or_unadd(redata,redata->plugins+i

+                          ,(undo!=NULL)?redata->undostack.undo+redata->undostack.usedundo-1

+                                       :redata->redostack.undo+redata->redostack.usedundo-1

+                          ,(undo!=NULL)?0:1);

+                }

         }

         /* compact if needed */

         if(redata_getsize(redata)>(redata->chunkdatasize) && redata_getavailable(redata)>(redata_getsize(redata)/2))

@@ -1131,8 +1135,12 @@ redata_op_del(redata_t *redata, long delpos, long size, undostack_t *fromhere)

         }

         /* add to plugins (unsaved,...) */

         for(i=0;i<redata->sizeplugins;i++) {

-                if(redata->plugins[i].add!=NULL)

-                        redata->plugins[i].add(redata,redata->plugins+i,redata->undostack.undo+redata->undostack.usedundo-1);

+                if(redata->plugins[i].add_or_unadd!=NULL) {

+                        redata->plugins[i].add_or_unadd(redata,redata->plugins+i

+                          ,(undo!=NULL)?redata->undostack.undo+redata->undostack.usedundo-1

+                                       :redata->redostack.undo+redata->redostack.usedundo-1

+                          ,(undo!=NULL)?0:1);

+                }

         }

         /* compact if needed */

         if(redata_getsize(redata)>(redata->chunkdatasize) && redata_getavailable(redata)>(redata_getsize(redata)/2))

@@ -1272,8 +1280,12 @@ redata_op_move(redata_t *redata, long posorig, long size, long posdest, undostac

         }

         /* add to plugins (unsaved,...) */

         for(i=0;i<redata->sizeplugins;i++) {

-                if(redata->plugins[i].add!=NULL)

-                        redata->plugins[i].add(redata,redata->plugins+i,redata->undostack.undo+redata->undostack.usedundo-1);

+                if(redata->plugins[i].add_or_unadd!=NULL) {

+                        redata->plugins[i].add_or_unadd(redata,redata->plugins+i

+                          ,(undo!=NULL)?redata->undostack.undo+redata->undostack.usedundo-1

+                                       :redata->redostack.undo+redata->redostack.usedundo-1

+                          ,(undo!=NULL)?0:1);

+                }

         }

         /* compact if needed */

         if(redata_getsize(redata)>(redata->chunkdatasize) && redata_getavailable(redata)>(redata_getsize(redata)/2))

@@ -74,8 +74,7 @@ typedef struct redata_plugin_t {

         int (*loadquestion)(/*redata_t *redata, redata_plugin_t *plugin,char *filename */);

         int (*postload)(/*redata_t *redata, redata_plugin_t *plugin,char *filename */);

         int (*postsave)(/*redata_t *redata, redata_plugin_t *plugin,char *oldfilename,char *newfilename*/);

-        int (*add)(/*redata_t *redata, redata_plugin_t *plugin,undo_t *undo*/);

-        int (*unadd)(/*redata_t *redata, redata_plugin_t *plugin,undo_t *undo*/);

+        int (*add_or_unadd)(/*redata_t *redata, redata_plugin_t *plugin,undo_t *undo, int is_unadd*/);

         int (*commit)(/*redata_t *redata, redata_plugin_t *plugin,char *filename*/);

         void *userptr;

 } redata_plugin_t;

@@ -46,8 +46,6 @@ typedef enum colorsenum_t {

 } colorsenum_t;

-static int redata_highlighter_add(redata_t *redata, redata_plugin_t *slot, undo_t *undo);

-static int redata_highlighter_unadd(redata_t *redata, redata_plugin_t *slot, undo_t *undo);

 static int redata_highlighter_add_or_unadd(redata_t *redata, redata_plugin_t *slot, undo_t *undo, int is_unadd);

 static int redata_highlighter_postload(redata_t *redata, redata_plugin_t *slot,char *filename);

@@ -68,6 +66,7 @@ redata_highlighter_register(redata_t *redata, redata_plugin_t *slot)

         highlighter_t *hl;

         if(redata==NULL || slot==NULL)

                 return(-1);

+        /* "forest" theme */

         colors=hl_initcolors(&ncolors,

                              color_keyword,"\x38\x17\x1e\xff",

                              color_directive,"\x38\x4b\x00\xff",

@@ -97,8 +96,7 @@ redata_highlighter_register(redata_t *redata, redata_plugin_t *slot)

         slot->name[sizeof(slot->name)-1]='\0';

         slot->unregister=redata_highlighter_unregister;

         slot->postload=redata_highlighter_postload;

-        slot->add=redata_highlighter_add;

-        slot->unadd=redata_highlighter_unadd;

+        slot->add_or_unadd=redata_highlighter_add_or_unadd;

         slot->userptr=hl;

         return(0);

 }

@@ -170,36 +168,20 @@ redata_highlighter_getcolorindex(redata_t *redata, int line, int nthbyte)

         return(-1);

 }

-

-static int

-redata_highlighter_add(redata_t *redata, redata_plugin_t *slot, undo_t *undo)

-{

-        return(redata_highlighter_add_or_unadd(redata, slot, undo, 0));

-}

-

-static int

-redata_highlighter_unadd(redata_t *redata, redata_plugin_t *slot, undo_t *undo)

-{

-        return(redata_highlighter_add_or_unadd(redata, slot, undo, 1));

-}

-

-

 static int

 redata_highlighter_add_or_unadd(redata_t *redata, redata_plugin_t *slot, undo_t *undo, int is_unadd)

 {

         long pos;

         int nline;

-        undostack_t *stack;

         highlighter_t *hl=(highlighter_t *) ((slot!=NULL)?(slot->userptr):NULL);

-        stack=redata_getstack(redata,undo);

-        if(redata==NULL || slot==NULL || hl==NULL || undo==NULL || stack==NULL || slot->active==0)

+        if(redata==NULL || slot==NULL || hl==NULL || undo==NULL || slot->active==0)

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

         if(hl->usedlines==0) {

                 return(0); /* nothing to do */

         }

         /* get the first pos of the operation */

         pos=undo->posorig;

-        if(undo->type=='D')

+        if((!is_unadd && undo->type=='D') || (is_unadd && undo->type=='A'))

                 pos-=undo->len;

         if(undo->type=='M' && undo->posdest<pos)

                 pos=undo->posdest;

@@ -33,8 +33,6 @@ typedef struct cproto_t {

         char buffer[MAXINDEXDATALEN];

 } cproto_t;

-static int redata_prototypes_add(redata_t *redata, redata_plugin_t *slot, undo_t *undo);

-static int redata_prototypes_unadd(redata_t *redata, redata_plugin_t *slot, undo_t *undo);

 static int redata_prototypes_add_or_unadd(redata_t *redata, redata_plugin_t *slot, undo_t *undo, int is_unadd);

 static int redata_prototypes_postload(redata_t *redata, redata_plugin_t *slot,char *filename);

 static cproto_t *cproto_getplugin(redata_t *redata);

@@ -80,8 +78,7 @@ redata_prototypes_register(redata_t *redata, redata_plugin_t *slot)

         slot->name[sizeof(slot->name)-1]='\0';

         slot->unregister=redata_prototypes_unregister;

         slot->postload=redata_prototypes_postload;

-        slot->add=redata_prototypes_add;

-        slot->unadd=redata_prototypes_unadd;

+        slot->add_or_unadd=redata_prototypes_add_or_unadd;

         slot->userptr=cproto;

         return(0);

 }

@@ -102,19 +99,6 @@ redata_prototypes_unregister(redata_t *redata, redata_plugin_t *slot,char *filen

 }

-static int

-redata_prototypes_add(redata_t *redata, redata_plugin_t *slot, undo_t *undo)

-{

-        return(redata_prototypes_add_or_unadd(redata, slot, undo, 0));

-}

-

-static int

-redata_prototypes_unadd(redata_t *redata, redata_plugin_t *slot, undo_t *undo)

-{

-        return(redata_prototypes_add_or_unadd(redata, slot, undo, 1));

-}

-

-

 static int

 redata_prototypes_add_or_unadd(redata_t *redata, redata_plugin_t *slot, undo_t *undo, int is_unadd)

 {

@@ -27,7 +27,8 @@

 #define UNSAVEDGROWSIZE (256*1024)

-

+int redata_unsaved_add(redata_t *redata, redata_plugin_t *slot, undo_t *undo);

+int redata_unsaved_unadd(redata_t *redata, redata_plugin_t *slot, undo_t *undo);

 static int redata_unsaved_loadquestion(redata_t *redata, redata_plugin_t *slot,char *filename);

 static int redata_unsaved_postload(redata_t *redata, redata_plugin_t *slot,char *filename);

 static int redata_unsaved_check_gen(redata_t *redata, redata_plugin_t *slot, char *filename);

@@ -55,8 +56,7 @@ redata_unsaved_register(redata_t *redata, redata_plugin_t *slot)

         slot->wipe=redata_unsaved_wipe;

         slot->postload=redata_unsaved_postload;

         slot->postsave=redata_unsaved_trunc;

-        slot->add=redata_unsaved_add;

-        slot->unadd=redata_unsaved_unadd;

+        slot->add_or_unadd=redata_unsaved_add_or_unadd;

         slot->commit=redata_unsaved_commit;

         slot->userptr=unsaved;

         return(0);

@@ -357,6 +357,15 @@ fprintf(stderr,"\n");

         return(0);

 }

+int

+redata_unsaved_add_or_unadd(redata_t *redata, redata_plugin_t *slot, undo_t *undo, int is_unadd)

+{

+        return((is_unadd==0)?

+          redata_unsaved_add(redata, slot, undo):

+          redata_unsaved_unadd(redata, slot, undo));

+}

+

+

 int

 redata_unsaved_add(redata_t *redata, redata_plugin_t *slot, undo_t *undo)

 {

@@ -32,7 +32,7 @@ int redata_unsaved_truncload(redata_t *redata, redata_plugin_t *slot, char *file

 int redata_unsaved_loadappend(redata_t *redata, redata_plugin_t *slot, char *filename);

 int redata_unsaved_unlink(redata_t *redata, redata_plugin_t *slot, char *filename);

 int redata_unsaved_trunc(redata_t *redata, redata_plugin_t *slot, char *oldfilename, char *newfilename);

-int redata_unsaved_add(redata_t *redata, redata_plugin_t *slot, undo_t *undo);

+int redata_unsaved_add_or_unadd(redata_t *redata, redata_plugin_t *slot, undo_t *undo, int is_unadd);

 int redata_unsaved_unadd(redata_t *redata, redata_plugin_t *slot, undo_t *undo);

 int redata_unsaved_commit(redata_t *redata, redata_plugin_t *slot, char *filename);