From: Benno Schulenberg <bensberg@justemail.net>
Date: Sat, 20 Jun 2015 09:42:26 +0000 (+0000)
Subject: Reverting the last commit, as it is making things worse:
X-Git-Tag: v2.4.2~14
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=57f52a8a2003c8026302acb8e8d48785ea08ff26;p=nano.git

Reverting the last commit, as it is making things worse:
backspacing at the tail of the file no longer has any efffect.


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

diff --git a/ChangeLog b/ChangeLog
index 7073ae73..b3c41eb1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,8 +8,6 @@
 	only when the specified menu name is an existing one.
 	* doc/syntax/changelog.nanorc: Stop the changed-files colour from
 	spilling beyond a blank line.  Also highlight releases.
-	* src/text.c (do_deletion): Instead of deleting and then re-adding
-	the magic line, simply don't delete it.
 
 2015-06-18  Benno Schulenberg  <bensberg@justemail.net>
 	* src/rcfile.c: Allow a tiny nano's ~/.nanorc to enable search and
diff --git a/src/text.c b/src/text.c
index 36b882f7..3d3033aa 100644
--- a/src/text.c
+++ b/src/text.c
@@ -123,11 +123,6 @@ void do_deletion(undo_type action)
 #ifndef NANO_TINY
 	add_undo(action);
 #endif
-
-	if (!ISSET(NO_NEWLINES) && foo == openfile->filebot)
-	    /* Don't delete the magic line. */
-	    return;
-
 	/* If we're deleting at the end of a line, we need to call
 	 * edit_refresh(). */
 	if (openfile->current->data[openfile->current_x] == '\0')
@@ -150,6 +145,13 @@ void do_deletion(undo_type action)
 	delete_node(foo);
 	renumber(openfile->current);
 	openfile->totsize--;
+
+	/* If the NO_NEWLINES flag isn't set, and text has been added to
+	 * the magicline as a result of deleting at the end of the line
+	 * before filebot, add a new magicline. */
+	if (!ISSET(NO_NEWLINES) && openfile->current ==
+		openfile->filebot && openfile->current->data[0] != '\0')
+	    new_magicline();
     } else
 	return;