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/6161_e7ca78c6f29c.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/6161_e7ca78c6f29c.patch')
| -rw-r--r-- | src/scintilla_backports/6161_e7ca78c6f29c.patch | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/src/scintilla_backports/6161_e7ca78c6f29c.patch b/src/scintilla_backports/6161_e7ca78c6f29c.patch deleted file mode 100644 index cd8e88d4..00000000 --- a/src/scintilla_backports/6161_e7ca78c6f29c.patch +++ /dev/null @@ -1,27 +0,0 @@ -# HG changeset patch -# User Neil <nyamatongwe@gmail.com> -# Date 1491209937 -36000 -# Node ID e7ca78c6f29cf64c8c26e3e6ee2d63f4dbd48909 -# Parent a1a9cde519976fa12e46224d6cd57483bc4633ae -Prevent warning from MSVC Code Analysis. - -diff -r a1a9cde51997 -r e7ca78c6f29c src/Decoration.cxx ---- a/src/Decoration.cxx Sun Apr 02 08:17:38 2017 +1000 -+++ b/src/Decoration.cxx Mon Apr 03 18:58:57 2017 +1000 -@@ -89,10 +89,12 @@ - decoToDelete = root; - root = root->Next(); - } else { -- Decoration *deco=root; -- while (deco->Next() && !decoToDelete) { -- if (deco->Next() && deco->Next()->Indicator() == indicator) { -- decoToDelete = deco->Next(); -+ Decoration *deco = root; -+ while (deco && deco->Next() && !decoToDelete) { -+ // decoNext ensures no warning from MSVC Code Analysis -+ Decoration *decoNext = deco->Next(); -+ if (decoNext && deco->Next()->Indicator() == indicator) { -+ decoToDelete = decoNext; - deco->next = decoToDelete->Next(); - } else { - deco = deco->Next(); |