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

painting: advance only when both start /and/ end match are zero-length

master
Benno Schulenberg 2017-01-21 19:35:11 +01:00
parent 775f007348
commit 8441887ec0
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/winio.c
View File

@ -2480,20 +2480,15 @@ void edit_draw(filestruct *fileptr, const char *converted,
while (TRUE) { while (TRUE) {
/* Begin searching for an end after the start match. */ /* Begin searching for an end after the start match. */
index += startmatch.rm_eo; index += startmatch.rm_eo;
/* If the start match is of length zero, step ahead. */
if (startmatch.rm_so == startmatch.rm_eo) {
if (start_line->data[index] == '\0')
break;
index = move_mbright(start_line->data, index);
}
/* If there is no end after this last start, good. */ /* If there is no end after this last start, good. */
if (regexec(varnish->end, start_line->data + index, if (regexec(varnish->end, start_line->data + index,
1, &endmatch, REG_NOTBOL) == REG_NOMATCH) 1, &endmatch, REG_NOTBOL) == REG_NOMATCH)
break; break;
/* Begin searching for a new start after the end match. */ /* Begin searching for a new start after the end match. */
index += endmatch.rm_eo; index += endmatch.rm_eo;
/* If the end match is of length zero, step ahead. */ /* If both start and end match are mere anchors, advance. */
if (endmatch.rm_so == endmatch.rm_eo) { if (startmatch.rm_so == startmatch.rm_eo &&
endmatch.rm_so == endmatch.rm_eo) {
if (start_line->data[index] == '\0') if (start_line->data[index] == '\0')
break; break;
index = move_mbright(start_line->data, index); index = move_mbright(start_line->data, index);
@ -2578,8 +2573,9 @@ void edit_draw(filestruct *fileptr, const char *converted,
#endif #endif
} }
index = endmatch.rm_eo; index = endmatch.rm_eo;
/* If the end match is of length zero, step ahead. */ /* If both start and end match are anchors, advance. */
if (endmatch.rm_so == endmatch.rm_eo) { if (startmatch.rm_so == startmatch.rm_eo &&
endmatch.rm_so == endmatch.rm_eo) {
if (fileptr->data[index] == '\0') if (fileptr->data[index] == '\0')
break; break;
index = move_mbright(fileptr->data, index); index = move_mbright(fileptr->data, index);