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

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

master
Benno Schulenberg 2021-01-29 10:58:09 +01:00
parent 36855544d1
commit a8e2a24f60
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/color.c
View File

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