From ec391b6bfe8d87f4fb1bbb2a4e6033eaad9f4672 Mon Sep 17 00:00:00 2001 From: mitchell <70453897+667e-11@users.noreply.github.com> Date: Mon, 12 Mar 2018 18:20:24 -0400 Subject: 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. --- src/scintilla_backports/6119_71bee2f06619.patch | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 src/scintilla_backports/6119_71bee2f06619.patch (limited to 'src/scintilla_backports/6119_71bee2f06619.patch') diff --git a/src/scintilla_backports/6119_71bee2f06619.patch b/src/scintilla_backports/6119_71bee2f06619.patch deleted file mode 100644 index 693749c7..00000000 --- a/src/scintilla_backports/6119_71bee2f06619.patch +++ /dev/null @@ -1,24 +0,0 @@ -# HG changeset patch -# User Neil -# Date 1488922409 -39600 -# Node ID 71bee2f066197ae012f92de55433700df2bdcd09 -# Parent 559dea66606f42c080f04db706a1ebe6bef83713 -Bug [#1910]. Fixed more duplicate code. - -diff -r 559dea66606f -r 71bee2f06619 gtk/ScintillaGTKAccessible.cxx ---- a/gtk/ScintillaGTKAccessible.cxx Tue Mar 07 22:27:40 2017 +1100 -+++ b/gtk/ScintillaGTKAccessible.cxx Wed Mar 08 08:33:29 2017 +1100 -@@ -880,13 +880,6 @@ - character_offsets.resize(line + 1); - } - } -- if (nt->modificationType & (SC_MOD_INSERTTEXT | SC_MOD_DELETETEXT)) { -- // invalidate character offset cache if applicable -- const Position line = sci->pdoc->LineFromPosition(nt->position); -- if (character_offsets.size() > static_cast(line + 1)) { -- character_offsets.resize(line + 1); -- } -- } - if (nt->modificationType & SC_MOD_INSERTTEXT) { - int startChar = CharacterOffsetFromByteOffset(nt->position); - int lengthChar = sci->pdoc->CountCharacters(nt->position, nt->position + nt->length); -- cgit v1.2.3