diff options
| author | Sven Strickroth <email@cs-ware.de> | 2017-01-22 17:41:23 +1100 |
|---|---|---|
| committer | Sven Strickroth <email@cs-ware.de> | 2017-01-22 17:41:23 +1100 |
| commit | 013bf48bff4164a02137b2e790bbed8b32c4e98e (patch) | |
| tree | c59563b3dd25346500298afdee928d0cc491df66 | |
| parent | eec253d225f0e3d8eb594b8dfa8fe24e2d2dcb17 (diff) | |
| download | scintilla-mirror-013bf48bff4164a02137b2e790bbed8b32c4e98e.tar.gz | |
Correctly color code deleted lines starting with "--"
This fixes the coloring of deleted lines in which starts with "--" such as closing HTML comments ("-->").
Signed-off-by: Sven Strickroth <email@cs-ware.de>
| -rw-r--r-- | doc/ScintillaHistory.html | 3 | ||||
| -rw-r--r-- | lexers/LexDiff.cxx | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index 58743678e..0972070d6 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -525,6 +525,9 @@ Released 30 December 2016. </li> <li> + The Diff lexer recognizes deleted lines that start with "--- ". + </li> + <li> The Lua lexer requires the first line to start with "#!" to be treated as a shebang comment, not just "#". <a href="http://sourceforge.net/p/scintilla/bugs/1900/">Bug #1900</a>. diff --git a/lexers/LexDiff.cxx b/lexers/LexDiff.cxx index baa8368f6..bfc22b9f6 100644 --- a/lexers/LexDiff.cxx +++ b/lexers/LexDiff.cxx @@ -51,8 +51,10 @@ static void ColouriseDiffLine(char *lineBuffer, Sci_Position endLine, Accessor & styler.ColourTo(endLine, SCE_DIFF_POSITION); else if (lineBuffer[3] == '\r' || lineBuffer[3] == '\n') styler.ColourTo(endLine, SCE_DIFF_POSITION); - else + else if (lineBuffer[3] == ' ') styler.ColourTo(endLine, SCE_DIFF_HEADER); + else + styler.ColourTo(endLine, SCE_DIFF_DELETED); } else if (0 == strncmp(lineBuffer, "+++ ", 4)) { // I don't know of any diff where "+++ " is a position marker, but for // consistency, do the same as with "--- " and "*** ". |