undo: after undoing a cut, don't remove the magicline if we're on it

This fixes https://savannah.gnu.org/bugs/?55332.

undo: after undoing a cut, don't remove the magicline if we're on it
This fixes https://savannah.gnu.org/bugs/?55332.
d0982536 · David Lawrence Ramsey · Benno Schulenberg · 798695ff · d0982536
Commit d0982536 authored 6 years ago by David Lawrence Ramsey Committed by Benno Schulenberg 6 years ago
Hide whitespace changes
Inline Side-by-side

Showing

with 2 additions and 1 deletion
+2 -1
--- a/src/text.c
+++ b/src/text.c
@@ -671,7 +671,8 @@ void undo_cut(undo *u)
 	copy_from_buffer(u->cutbuffer);

 	/* If the final line was originally cut, remove the extra magicline. */
-	if ((u->xflags & WAS_FINAL_LINE) && !ISSET(NO_NEWLINES))
+	if ((u->xflags & WAS_FINAL_LINE) && !ISSET(NO_NEWLINES) &&
+			openfile->current != openfile->filebot)
 		remove_magicline();

 	if (!(u->xflags & WAS_MARKED_FORWARD) && u->type != PASTE)