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

justify: trim the leading blanks of a marked region at the right moment 

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

Bug existed since commit 5310a355 from three hours ago.
master
Benno Schulenberg 2020-03-09 14:00:30 +01:00
parent 8f3ea23ece
commit c457f744ef
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/text.c
View File

@ -1862,15 +1862,9 @@ void do_justify(bool full_justify)
if (openfile->mark) { if (openfile->mark) {
size_t line_len = strlen(cutbuffer->data); size_t line_len = strlen(cutbuffer->data);
size_t white_len = indent_length(cutbuffer->data);
linestruct *line; linestruct *line;
size_t white_len;
/* Trim any whitespace at the start of the extracted region. */ char *afterlead;
if (white_len > 0) {
memmove(cutbuffer->data, cutbuffer->data + white_len,
line_len - white_len + 1);
line_len -= white_len;
}
/* If the marked region started in the middle of a line, and this line /* If the marked region started in the middle of a line, and this line
* has a leading part, then prepend this same leading part also to the * has a leading part, then prepend this same leading part also to the
@ -1881,6 +1875,13 @@ void do_justify(bool full_justify)
strncpy(cutbuffer->data, the_lead, lead_len); strncpy(cutbuffer->data, the_lead, lead_len);
} }
afterlead = cutbuffer->data + lead_len;
white_len = indent_length(afterlead);
/* If the marked region started with whitespace, trim it. */
if (white_len > 0)
memmove(afterlead, afterlead + white_len, line_len - white_len + 1);
/* Now justify the extracted region. */ /* Now justify the extracted region. */
concat_paragraph(&cutbuffer, linecount); concat_paragraph(&cutbuffer, linecount);
squeeze(cutbuffer, lead_len); squeeze(cutbuffer, lead_len);