ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

justify: correctly detect when we've reached end of buffer 

When, in the 'while' loop for a full justify, 'filebot_inpar' becomes
TRUE, it means that EOF has been reached and find_paragraph() should
not be called again.  To allow 'filebot_inpar' to convey this meaning,
it should not be set to TRUE elsewhere, so another boolean is needed
for setting the correct length of the final line of the cutbuffer.

This fixes https://savannah.gnu.org/bugs/?55086.
master
Benno Schulenberg 2018-11-25 11:51:30 +01:00
parent 67e6eee26e
commit 66cd897dc4
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/text.c
View File

@ -2231,6 +2231,8 @@ void do_justify(bool full_justify)
* paragraph(s), if any. */
bool filebot_inpar;
/* Whether the text at filebot is part of the current paragraph. */
bool text_on_last_line = FALSE;
/* Whether the last line of the buffer contains text. */
filestruct *was_cutbuffer = cutbuffer;
/* The old cutbuffer, so we can justify in the current cutbuffer. */
@ -2278,12 +2280,9 @@ void do_justify(bool full_justify)
* last line of the file (counting the text at filebot). Otherwise, move
* last_par_line down to the last line of the paragraph. */
if (full_justify) {
jus_len = openfile->filebot->lineno - first_par_line->lineno;
if (openfile->filebot->data[0] != '\0') {
jus_len++;
filebot_inpar = TRUE;
}
text_on_last_line = (openfile->filebot->data[0] != '\0');
jus_len = openfile->filebot->lineno - first_par_line->lineno +
(text_on_last_line ? 1 : 0);
} else
jus_len = par_len;
@ -2304,7 +2303,7 @@ void do_justify(bool full_justify)
#endif
/* Do the equivalent of a marked cut. */
extract_buffer(&cutbuffer, &cutbottom, first_par_line, 0, last_par_line,
filebot_inpar ? strlen(last_par_line->data) : 0);
filebot_inpar || text_on_last_line ? strlen(last_par_line->data) : 0);
#ifndef NANO_TINY
update_undo(CUT);
#endif
@ -2318,7 +2317,8 @@ void do_justify(bool full_justify)
/* If we're justifying the entire file, search for and justify paragraphs
* until we can't anymore. */
if (full_justify) {
while (find_paragraph(&jusline, &filebot_inpar, &quote_len, &par_len))
while (!filebot_inpar &&
find_paragraph(&jusline, &filebot_inpar, &quote_len, &par_len))
justify_paragraph(&jusline, quote_len, par_len);
}