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
master
Chris Allegretta 2001-02-10 17:50:50 +00:00
parent 8bc03b6fdc
commit 4ed131510e
2 changed files with 8 additions and 2 deletions

View File

@ -5,6 +5,10 @@ CVS code -
do_cut_text()
- marked text cut fixes (Rocco) (Fixes bug #54).
- nano.c:
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).
do_justify()
- If the keystroke after the justify is not the unjustify key,
blank the statsubar (bug reported by Neil Parks).

6
nano.c
View File

@ -1080,7 +1080,9 @@ int do_delete(void)
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 @@ int do_delete(void)
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();