nano

commit 07f40612e1f590975afa214ab48d30cb58a90ec5
parent fb6c0cd20ccc161ce7c1cb3ece80f11795332ddc
Author: Benno Schulenberg <bensberg@justemail.net>
Date:   Sun, 22 Jun 2014 10:14:48 +0000

When redoing a line join at the tail of the file,
make sure openfile->filebot is updated.
Patch by Mark Majeres.


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

Diffstat:
M
ChangeLog
 | 
4
++++
M
src/text.c
 | 
2
++

2 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+2014-06-22  Mark Majeres  <mark@engine12.com>
+	* src/text.c (do_redo): When redoing a line join at the tail
+        of the file, make sure openfile->filebot is updated.
+
 2014-06-21  Mark Majeres  <mark@engine12.com>
 	* src/text.c (undo_cut, add_undo): When undoing a cut-till-eof,
 	put the cursor back where the cut started, and not at the end.
diff --git a/src/text.c b/src/text.c
@@ -640,6 +640,8 @@ void do_redo(void)
 	strcat(f->data, u->strdata);
 	if (f->next != NULL) {
 	    filestruct *tmp = f->next;
+	    if (tmp == openfile->filebot)
+		openfile->filebot = f;
 	    unlink_node(tmp);
 	    delete_node(tmp);
 	}