@@ -988,7 +988,10 @@ redata_op_add(redata_t *redata, long insertpos, char *buf, long buflen, undostac

                 bothering=chunk->useddata-pos;

                 bothering=(bothering>nextavail)?nextavail:bothering;

                 redata_chunk_movedata(redata,chunkno,chunk->useddata-bothering,chunkno+1,0,bothering);

-                redata_chunk_insertdata(redata,chunkno,pos,buf,buflen);

+                avail=redata->chunkdatasize-chunk->useddata;

+                avail=(avail>buflen)?buflen:avail;

+                redata_chunk_insertdata(redata,chunkno,pos,buf,avail);

+                redata_chunk_insertdata(redata,chunkno+1,0,buf+avail,buflen-avail);

         } else {

                 /* will need to add more chunks */

                 needed=(buflen+redata->chunkdatasize-1)/redata->chunkdatasize;

@@ -1068,7 +1071,7 @@ redata_op_del(redata_t *redata, long delpos, long size, undostack_t *fromhere)

                 curpos=(curchunk==chunkno)?pos:0;

                 curdel=redata->chunks[curchunk]->useddata-curpos;

                 curdel=(curdel>(size-ndel))?(size-ndel):curdel;

-                redata_chunk_deletedata(redata,chunkno,curpos,curdel);

+                redata_chunk_deletedata(redata,curchunk,curpos,curdel);

                 ndel+=curdel;

         }

         /* fix nl and delete unused chunks */

@@ -43,11 +43,13 @@ main(int argc, char *argv[])

         static int sizes[]={-1,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,30,31,32,33,63,64,65,127,128,129,1023,1024,1025,16384};

         test_t tests[]={

                 {"newfile_16",test_newfile,PREFIX "FILE", NULL, 16, 0},

-/*                {"newfile_1024",test_newfile,PREFIX "FILE", NULL, 1024, 0},

+#if 0 /* more newfile tests (VERY slow) */

+                {"newfile_1024",test_newfile,PREFIX "FILE", NULL, 1024, 0},

                 {"newfile_32767",test_newfile,PREFIX "FILE", NULL, 32767, 0},

                 {"newfile_32768",test_newfile,PREFIX "FILE", NULL, 32768, 0},

                 {"newfile_32769",test_newfile,PREFIX "FILE", NULL, 32769, 0},

-                {"newfile_131072",test_newfile,PREFIX "FILE", NULL, 131072, 0},*/

+                {"newfile_131072",test_newfile,PREFIX "FILE", NULL, 131072, 0},

+#endif

                 {"testedit_add",test_edit,PREFIX "EDIT", "A0$Testing add$",0,0},

                 {"testedit_del",test_edit,PREFIX "EDIT", "A0$Testing add/del$D8$add/$",0,0},

         };

@@ -74,15 +76,20 @@ main(int argc, char *argv[])

                         } else {

                                 fprintf(stderr," ERROR: %s\n",res);

                                 nerrors++;

-                                }

+#if 0

+/* exit on first error */

+s=sizeof(sizes)/sizeof(sizes[0]);

+break;

+#endif

+                        }

                         redata_free(redata),redata=NULL;

                 }

                 fprintf(stderr,"\n");

         }

         if(nerrors==0)

-                fprintf(stderr,"All tests passed OK\n");

+                fprintf(stderr,"All %i tests passed OK\n",total);

         else

-                fprintf(stderr,"%i test(s) failed of %i tests run.\n",nerrors,i);

+                fprintf(stderr,"%i test(s) failed of %i tests run.\n",nerrors,total);

         redata_free(redata),redata=NULL;

         return((nerrors==0)?0:1);

 }

@@ -181,7 +188,8 @@ fprintf(stderr,"\ntest_edit(%s%s%s,%s%s%s,%i,%i);\nResult: ",(filename!=NULL)?"\

                                 progress[l]=(l<(sizeof(progress)-2))?*ptr:'+';

                                 progress[l+1]='\0';

                         }

-/*if(k!=0) redata_save(redata,"test.pre");*/

+if(k!=0) unlink("test.pre"),unlink("test.post"),unlink("test.undo"),unlink("test.redo");

+if(k!=0) redata_save(redata,"test.pre");

                         if(*ptr=='A') {

                                 /* A<insertpos><endchar><text><endchar> */

                                 ptr++;

@@ -251,7 +259,7 @@ fprintf(stderr,"\ntest_edit(%s%s%s,%s%s%s,%i,%i);\nResult: ",(filename!=NULL)?"\

                         if(cursize>maxsize)

                                 maxsize=cursize;

                         if(k!=0) {

-/*if(k!=0) redata_save(redata,"test.post");*/

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

                                 redata_hash(redata,hash129_redata);

                                 redata_memhash(redata,mem,cursize,hash129_mem);

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

@@ -263,7 +271,7 @@ fprintf(stderr,"\ntest_edit(%s%s%s,%s%s%s,%i,%i);\nResult: ",(filename!=NULL)?"\

                                         return(errorbuf);

                                 }

                                 redata_op_undo(redata);

-/*redata_save(redata,"test.undo");*/

+redata_save(redata,"test.undo");

                                 redata_hash(redata,hash129_redata);

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

                                         if(mem!=NULL)

@@ -274,7 +282,7 @@ fprintf(stderr,"\ntest_edit(%s%s%s,%s%s%s,%i,%i);\nResult: ",(filename!=NULL)?"\

                                         return(errorbuf);

                                 }

                                 redata_op_redo(redata);

-/*redata_save(redata,"test.redo");*/

+redata_save(redata,"test.redo");

                                 redata_hash(redata,hash129_redata);

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

                                         if(mem!=NULL)

@@ -301,6 +309,7 @@ fprintf(stderr,"\ntest_edit(%s%s%s,%s%s%s,%i,%i);\nResult: ",(filename!=NULL)?"\

         }

         if(mem!=NULL)

                 free(mem),mem=NULL;

+unlink("test.pre"),unlink("test.post"),unlink("test.undo"),unlink("test.redo");

         return(TEST_OK);

 }