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

wrapping: delete trailing blanks upon hardwrapping, when requested 

This fulfills https://savannah.gnu.org/bugs/?52198.
master
Benno Schulenberg 2017-12-02 10:06:12 +01:00
parent 0c40f87b55
commit c30d3d8010
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/text.c
View File

@ -1613,7 +1613,7 @@ bool do_wrap(filestruct *line)
openfile->current_x = line_len; openfile->current_x = line_len;
/* If the remainder doesn't end in a blank, add a space. */ /* If the remainder doesn't end in a blank, add a space. */
if (!is_blank_mbchar(tail) && !ISSET(JUSTIFY_TRIM)) { if (!is_blank_mbchar(tail)) {
#ifndef NANO_TINY #ifndef NANO_TINY
add_undo(ADD); add_undo(ADD);
#endif #endif
@ -1638,8 +1638,21 @@ bool do_wrap(filestruct *line)
} }
} }
/* Go to the wrap location and split the line there. */ /* Go to the wrap location. */
openfile->current_x = wrap_loc; openfile->current_x = wrap_loc;
/* When requested, snip trailing blanks off the wrapped line. */
if (ISSET(JUSTIFY_TRIM)) {
size_t cur_x = move_mbleft(line->data, wrap_loc);
while (is_blank_mbchar(line->data + cur_x)) {
openfile->current_x = cur_x;
do_delete();
cur_x = move_mbleft(line->data, cur_x);
}
}
/* Now split the line. */
do_enter(); do_enter();
if (old_x < wrap_loc) { if (old_x < wrap_loc) {