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 7073ae73dd17d1991e1aa277d4b0c998c6d12f38..b3c41eb145d9db47ddee15bba7e20b25c1596f8d 100644 (file)
--- 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 36b882f781405894b420e7d4f5396c911bdf7ae7..3d3033aa4dfd9ed972f14b60b8fc50fdcc014f86 100644 (file)
--- 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;