commit 4ed131510e5200f9c24155e0f1ceb61536981ee5
author Chris Allegretta <chrisa@asty.org> Sat Feb 10 17:50:50 2001 +0000
committer Chris Allegretta <chrisa@asty.org> Sat Feb 10 17:50:50 2001 +0000
tree 64000be3cdc40b870b38d31b9a1be4678eadc6cb
parent 8bc03b6fdcc20acc078d400e6c5be90c2534db4f

do_delete() - Added check for current->next == fileptr, as we have a magic  line code again, fixes sillyness at the end of the last line before the magic line (reported by J.A. Neitzel)


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

nano.c

diff --git a/nano.c b/nano.c
index 76812b6..d133ab4 100644
--- a/nano.c
+++ b/nano.c
@@ -1080,7 +1080,9 @@
 
 	align(&current->data);
 
-    } else if (current->next != NULL) {
+    /* Now that we have a magic lnie again, we can check for both being
+       on the line before filebot as well as at filebot */
+    } else if (current->next != NULL && current->next != filebot) {
 	current->data = nrealloc(current->data,
 				 strlen(current->data) +
 				 strlen(current->next->data) + 1);
@@ -1096,7 +1098,7 @@
 	delete_node(foo);
 	update_line(current, current_x);
 
-	/* Please see the comment in do_basckspace if you don't understand
+	/* Please see the comment in do_backspace if you don't understand
 	   this test */
 	if (current == filebot && strcmp(current->data, "")) {
 	    new_magicline();