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

wrapping: add a missing space only when the remainder will be prepended 

When automatic hard-wrapping causes some piece of a line to be pushed
to the next line, then a separating space needs to be added at the tail
of this piece only when this piece actually gets prepended.

This fixes https://savannah.gnu.org/bugs/?56185.

Bug existed since version 2.9.2, commit 29f7654a.
master
Benno Schulenberg 2019-04-21 10:06:56 +02:00
parent 297fb013cb
commit e8f69e40d1
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/text.c
View File

@ -1466,7 +1466,8 @@ bool do_wrap(void)
/* We prepend the wrapped text to the next line, if the prepend_wrap /* We prepend the wrapped text to the next line, if the prepend_wrap
* flag is set, there is a next line, and prepending would not make * flag is set, there is a next line, and prepending would not make
* the line too long. */ * the line too long. */
if (prepend_wrap && line != openfile->filebot) { if (prepend_wrap && line != openfile->filebot &&
rest_length + strlen(line->next->data) <= wrap_at) {
const char *tail = remainder + move_mbleft(remainder, rest_length); const char *tail = remainder + move_mbleft(remainder, rest_length);
/* Go to the end of the line. */ /* Go to the end of the line. */
@ -1488,14 +1489,12 @@ bool do_wrap(void)
#endif #endif
} }
if (rest_length + strlen(line->next->data) <= wrap_at) {
/* Delete the LF to join the two lines. */ /* Delete the LF to join the two lines. */
do_delete(); do_delete();
/* Delete any leading blanks from the joined-on line. */ /* Delete any leading blanks from the joined-on line. */
while (is_blank_mbchar(&line->data[openfile->current_x])) while (is_blank_mbchar(&line->data[openfile->current_x]))
do_delete(); do_delete();
} }
}
/* Go to the wrap location. */ /* Go to the wrap location. */
openfile->current_x = wrap_loc; openfile->current_x = wrap_loc;