From 387cf0327b3c42baa90933d9b977060aefe2d67d Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Fri, 18 Oct 2002 05:25:01 +0000 Subject: [PATCH] * wordproc.c (end_paragraph): The last line of the file wasn't tested for being blank, which resulted in the last newline becoming a space after formatting. --- edit/ChangeLog | 6 ++++++ edit/wordproc.c | 9 ++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/edit/ChangeLog b/edit/ChangeLog index 67e48d19d..0ceccdd07 100644 --- a/edit/ChangeLog +++ b/edit/ChangeLog @@ -1,3 +1,9 @@ +2002-10-18 Pavel Roskin + + * wordproc.c (end_paragraph): The last line of the file wasn't + tested for being blank, which resulted in the last newline + becoming a space after formatting. + 2002-10-17 Pavel Roskin * editoptions.c (edit_options_dialog): Don't allow diff --git a/edit/wordproc.c b/edit/wordproc.c index 88f6514d8..6fd6eda3f 100644 --- a/edit/wordproc.c +++ b/edit/wordproc.c @@ -85,10 +85,11 @@ static long begin_paragraph (WEdit * edit, long p, int force) return edit_move_backward (edit, edit_bol (edit, edit->curs1), edit->curs_line - i); } -static long end_paragraph (WEdit * edit, long p, int force) +static long +end_paragraph (WEdit *edit, long p, int force) { int i; - for (i = edit->curs_line + 1; i < edit->total_lines; i++) { + for (i = edit->curs_line + 1; i <= edit->total_lines; i++) { if (line_is_blank (edit, i)) { i--; break; @@ -99,7 +100,9 @@ static long end_paragraph (WEdit * edit, long p, int force) break; } } - return edit_eol (edit, edit_move_forward (edit, edit_bol (edit, edit->curs1), i - edit->curs_line, 0)); + return edit_eol (edit, + edit_move_forward (edit, edit_bol (edit, edit->curs1), + i - edit->curs_line, 0)); } static unsigned char *get_paragraph (WEdit * edit, long p, long q, int indent, int *size)