tweaks: frob a condition, to be more concise, and reshuffle another

This commit is contained in:
Benno Schulenberg 2021-01-29 10:58:09 +01:00
parent 36855544d1
commit a8e2a24f60

View File

@ -261,19 +261,18 @@ void check_the_multis(linestruct *line)
anend = (regexec(ink->end, afterstart, 1, &endmatch, 0) == 0);
/* Check whether the multidata still matches the current situation. */
if (line->multidata[ink->id] == NOTHING ||
line->multidata[ink->id] == WHOLELINE) {
if (line->multidata[ink->id] & (NOTHING|WHOLELINE)) {
if (!astart && !anend)
continue;
} else if (line->multidata[ink->id] == JUSTONTHIS) {
if (astart && anend && startmatch.rm_so < endmatch.rm_so)
continue;
} else if (line->multidata[ink->id] == ENDSHERE) {
if (!astart && anend)
continue;
} else if (line->multidata[ink->id] == STARTSHERE) {
if (astart && !anend)
continue;
} else if (line->multidata[ink->id] == ENDSHERE) {
if (!astart && anend)
continue;
}
/* There is a mismatch, so something changed: repaint. */