From: Chris Allegretta <chrisa@asty.org>
Date: Wed, 29 Apr 2009 04:43:58 +0000 (+0000)
Subject: Comimt point for roll-back of latest undo/redo of split changes.
X-Git-Tag: v2.1.10~5
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=8b9fb360c25bd43480e13f49982911355c74a1fa;p=nano.git

Comimt point for roll-back of latest undo/redo of split changes.



git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4393 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
---

diff --git a/src/text.c b/src/text.c
index 62ef1ff9..e7131fe4 100644
--- a/src/text.c
+++ b/src/text.c
@@ -477,13 +477,13 @@ void do_undo(void)
 	undidmsg = _("line wrap");
 	f->data = nrealloc(f->data, strlen(f->data) + strlen(u->strdata) + 1);
 	strcpy(&f->data[strlen(f->data) - 1], u->strdata);
-	if (u->xflags & UNDO_SPLIT_MADENEW) {
+	if (u->strdata2 != NULL)
+	    f->next->data = mallocstrcpy(f->next->data, u->strdata2);
+	else {
 	    filestruct *foo = openfile->current->next;
 	    unlink_node(foo);
 	    delete_node(foo);
 	}
-	if (u->strdata2 != NULL)
-	    f->next->data = mallocstrcpy(f->next->data, u->strdata2);
 	renumber(f);
 	break;
     case UNSPLIT:
@@ -612,13 +612,16 @@ void do_redo(void)
 	break;
     case SPLIT:
 	undidmsg = _("line wrap");
-	t = make_new_node(f);
-	t->data = mallocstrcpy(NULL, &u->strdata[u->begin]);
 	data = mallocstrncpy(NULL, f->data, u->begin);
 	data[u->begin] = '\0';
 	free(f->data);
 	f->data = data;
-	splice_node(f, t, f->next);
+        if (u->strdata2 == NULL) {
+	    t = make_new_node(f);
+	    t->data = mallocstrcpy(NULL, u->strdata);
+	    splice_node(f, t, f->next);
+	} else
+	    f->next->data = mallocstrcpy(f->next->data, u->strdata2);
 	renumber(f);
 	break;
     case UNSPLIT:
@@ -904,6 +907,7 @@ void add_undo(undo_type current_action)
 	   will be created */
 	if (prepend_wrap)
 	    u->strdata2 = mallocstrcpy(NULL, fs->current->next->data);
+	u->begin = wrap_loc;
 	break;
     case INSERT:
     case REPLACE: