diff options
Diffstat (limited to 'src/LexOthers.cxx')
| -rw-r--r-- | src/LexOthers.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/LexOthers.cxx b/src/LexOthers.cxx index 701059143..babb3a0d3 100644 --- a/src/LexOthers.cxx +++ b/src/LexOthers.cxx @@ -346,6 +346,9 @@ static void ColouriseErrorListLine( if (lineBuffer[0] == '>') { // Command or return status styler.ColourTo(endPos, SCE_ERR_CMD); + } else if (lineBuffer[0] == '<') { + // Diff removal, but not interested. Trapped to avoid hitting CTAG cases. + styler.ColourTo(endPos, SCE_ERR_DEFAULT); } else if (lineBuffer[0] == '!') { styler.ColourTo(endPos, SCE_ERR_DIFF_CHANGED); } else if (lineBuffer[0] == '+') { @@ -410,7 +413,8 @@ static void ColouriseErrorListLine( break; } else if (((state == 11) || (state == 14)) && !((lineBuffer[i] == ' ') || isdigit(lineBuffer[i]))) { state = 99; - } else if ((state == 20) && isdigit(lineBuffer[i])) { + } else if ((state == 20) && (lineBuffer[i-1] == '\t') && + ((lineBuffer[i] == '/' && lineBuffer[i+1] == '^') || isdigit(lineBuffer[i]))) { state = 24; break; } else if ((state == 20) && ((lineBuffer[i] == '/') && (lineBuffer[i+1] == '^'))) { |