- Remove a debug line I left in

- Fix undo line split uglyness.  Still not perfect but switching work envs.



git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4390 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
Chris Allegretta 2009-04-12 06:13:16 +00:00
parent 12ba55732f
commit df543e78df
1 changed files with 6 additions and 3 deletions

View File

@ -475,9 +475,8 @@ void do_undo(void)
break;
case SPLIT:
undidmsg = _("line split");
fprintf(stderr, "u->strdata = \"%s\"\n", u->strdata);
f->data = nrealloc(f->data, strlen(f->data) + strlen(u->strdata) + 1);
strcat(f->data, u->strdata);
strcpy(&f->data[strlen(f->data) - 1], u->strdata);
if (u->xflags & UNDO_SPLIT_MADENEW) {
filestruct *foo = openfile->current->next;
unlink_node(foo);
@ -843,6 +842,7 @@ void add_undo(undo_type current_action)
fs->undotop = u;
fs->current_undo = u;
u->strdata = NULL;
u->strdata2 = NULL;
u->cutbuffer = NULL;
u->cutbottom = NULL;
u->mark_set = 0;
@ -882,7 +882,10 @@ void add_undo(undo_type current_action)
#endif
);
u->strdata = mallocstrcpy(NULL, &openfile->current->data[wrap_loc]);
u->strdata2 = mallocstrcpy(NULL, fs->current->next->data);
/* Don't both saving the next line if we're not prepending as a new line
will be created */
if (prepend_wrap)
u->strdata2 = mallocstrcpy(NULL, fs->current->next->data);
break;
case INSERT:
case REPLACE: