diff options
| author |   mitchell <70453897+667e-11@users.noreply.github.com> | 2017-04-07 18:10:12 -0400 |
|---|---|---|
| committer | mitchell <70453897+667e-11@users.noreply.github.com> | 2017-04-07 18:10:12 -0400 |
| commit | d255bd6711955192f98bed8bf0b98872dab7fca6 (patch) | |
| tree | ad4d14573ece5e8117c9de7ae246ecf711f70680 /src/scintilla_backports/6118_559dea66606f.patch | |
| parent | ea8dd79d8972d8a0e23d1be50cf26e3c2ccadda7 (diff) | |
| download | textadept-d255bd6711955192f98bed8bf0b98872dab7fca6.tar.gz textadept-d255bd6711955192f98bed8bf0b98872dab7fca6.zip | |
Effectively updated to Scintilla 3.7.4 with select backports to 3.7.3.
Scintilla 3.7.4 requires a C++11 compiler, which I do not have.
Diffstat (limited to 'src/scintilla_backports/6118_559dea66606f.patch')
| -rw-r--r-- | src/scintilla_backports/6118_559dea66606f.patch | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/src/scintilla_backports/6118_559dea66606f.patch b/src/scintilla_backports/6118_559dea66606f.patch new file mode 100644 index 00000000..cb791fc9 --- /dev/null +++ b/src/scintilla_backports/6118_559dea66606f.patch @@ -0,0 +1,20 @@ +# HG changeset patch +# User Neil <nyamatongwe@gmail.com> +# Date 1488886060 -39600 +# Node ID 559dea66606f42c080f04db706a1ebe6bef83713 +# Parent 23546875480b1ee4a3f309c738f64166a0409a46 +Bug [#1910]. Fixed double declaration. + +diff -r 23546875480b -r 559dea66606f gtk/ScintillaGTKAccessible.h +--- a/gtk/ScintillaGTKAccessible.h Tue Mar 07 22:20:45 2017 +1100 ++++ b/gtk/ScintillaGTKAccessible.h Tue Mar 07 22:27:40 2017 +1100 +@@ -23,9 +23,6 @@ + // cache holding character offset for each line start, see CharacterOffsetFromByteOffset() + std::vector<Position> character_offsets; + +- // cache holding character offset for each line start, see CharacterOffsetFromByteOffset() +- std::vector<Position> character_offsets; +- + // cached length of the deletion, in characters (see Notify()) + int deletionLengthChar; + // local state for comparing |