diff options
| author |   mitchell <70453897+667e-11@users.noreply.github.com> | 2018-03-12 18:20:24 -0400 |
|---|---|---|
| committer | mitchell <70453897+667e-11@users.noreply.github.com> | 2018-03-12 18:20:24 -0400 |
| commit | ec391b6bfe8d87f4fb1bbb2a4e6033eaad9f4672 (patch) | |
| tree | 3e465bb700187ef104363c31525a73a4147c0edb /src/scintilla_backports/6138_55368b05bb72.patch | |
| parent | f82726891b4cd2f323ce882e5aa6d71227dda887 (diff) | |
| download | textadept-ec391b6bfe8d87f4fb1bbb2a4e6033eaad9f4672.tar.gz textadept-ec391b6bfe8d87f4fb1bbb2a4e6033eaad9f4672.zip | |
Start using Scintilla's LongTerm3, which now includes Scintillua and Scinterm.
Since LongTerm3 requires a C++11 compiler, GCC 4.9+ is required.
Since C++11 includes regex capability, drop TRE dependency.
Diffstat (limited to 'src/scintilla_backports/6138_55368b05bb72.patch')
| -rw-r--r-- | src/scintilla_backports/6138_55368b05bb72.patch | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/src/scintilla_backports/6138_55368b05bb72.patch b/src/scintilla_backports/6138_55368b05bb72.patch deleted file mode 100644 index 7d6d4519..00000000 --- a/src/scintilla_backports/6138_55368b05bb72.patch +++ /dev/null @@ -1,40 +0,0 @@ -# HG changeset patch -# User Neil <nyamatongwe@gmail.com> -# Date 1489925352 -39600 -# Node ID 55368b05bb72a05862c4ffb6cb01a1ce70f64c0f -# Parent c3bba4a9193ea55175c309109e5bab8c87f2a0bd -Group non-single-phase drawing before text. - -diff -r c3bba4a9193e -r 55368b05bb72 src/EditView.cxx ---- a/src/EditView.cxx Thu Mar 16 14:05:22 2017 +1100 -+++ b/src/EditView.cxx Sun Mar 19 23:09:12 2017 +1100 -@@ -1846,18 +1846,18 @@ - xStart += static_cast<int>(ll->wrapIndent); - } - -- if ((phasesDraw != phasesOne) && (phase & drawBack)) { -- DrawBackground(surface, model, vsDraw, ll, rcLine, lineRange, posLineStart, xStart, -- subLine, background); -- DrawFoldDisplayText(surface, model, vsDraw, ll, line, xStart, rcLine, subLine, subLineStart, drawBack); -- phase = static_cast<DrawPhase>(phase & ~drawBack); -- DrawEOL(surface, model, vsDraw, ll, rcLine, line, lineRange.end, -- xStart, subLine, subLineStart, background); -- } -+ if (phasesDraw != phasesOne) { -+ if (phase & drawBack) { -+ DrawBackground(surface, model, vsDraw, ll, rcLine, lineRange, posLineStart, xStart, -+ subLine, background); -+ DrawFoldDisplayText(surface, model, vsDraw, ll, line, xStart, rcLine, subLine, subLineStart, drawBack); -+ phase = static_cast<DrawPhase>(phase & ~drawBack); // Remove drawBack to not draw again in DrawFoldDisplayText -+ DrawEOL(surface, model, vsDraw, ll, rcLine, line, lineRange.end, -+ xStart, subLine, subLineStart, background); -+ } - -- if (phase & drawIndicatorsBack) { -- DrawIndicators(surface, model, vsDraw, ll, line, xStart, rcLine, subLine, lineRange.end, true, model.hoverIndicatorPos); -- if (phasesDraw != phasesOne) { -+ if (phase & drawIndicatorsBack) { -+ DrawIndicators(surface, model, vsDraw, ll, line, xStart, rcLine, subLine, lineRange.end, true, model.hoverIndicatorPos); - DrawEdgeLine(surface, vsDraw, ll, rcLine, lineRange, xStart); - DrawMarkUnderline(surface, model, vsDraw, line, rcLine); - } |