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/6434_ed27432729c3.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/6434_ed27432729c3.patch')
| -rw-r--r-- | src/scintilla_backports/6434_ed27432729c3.patch | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/src/scintilla_backports/6434_ed27432729c3.patch b/src/scintilla_backports/6434_ed27432729c3.patch deleted file mode 100644 index fafca810..00000000 --- a/src/scintilla_backports/6434_ed27432729c3.patch +++ /dev/null @@ -1,50 +0,0 @@ -# HG changeset patch -# User Neil <nyamatongwe@gmail.com> -# Date 1517090168 -39600 -# Node ID ed27432729c386c48ef4f11459aeb2ed1f0856c8 -# Parent 231ac99e1fdc2b0fa62668cf5495b2f7df3f4d82 -Use std::abs in preference to abs as std::abs is generic and abs casts to int -which may drop information. - -diff -r 231ac99e1fdc -r ed27432729c3 src/Document.cxx ---- a/src/Document.cxx Sun Jan 28 08:32:17 2018 +1100 -+++ b/src/Document.cxx Sun Jan 28 08:56:08 2018 +1100 -@@ -10,6 +10,7 @@ - #include <cassert> - #include <cstring> - #include <cstdio> -+#include <cmath> - - #include <stdexcept> - #include <string> -@@ -877,7 +878,7 @@ - const Sci::Position posNext = NextPosition(pos, increment); - if (posNext == pos) - return INVALID_POSITION; -- if (abs(pos-posNext) > 3) // 4 byte character = 2*UTF16. -+ if (std::abs(pos-posNext) > 3) // 4 byte character = 2*UTF16. - characterOffset -= increment; - pos = posNext; - characterOffset -= increment; -diff -r 231ac99e1fdc -r ed27432729c3 src/Editor.cxx ---- a/src/Editor.cxx Sun Jan 28 08:32:17 2018 +1100 -+++ b/src/Editor.cxx Sun Jan 28 08:56:08 2018 +1100 -@@ -11,8 +11,8 @@ - #include <cstring> - #include <cctype> - #include <cstdio> -- - #include <cmath> -+ - #include <stdexcept> - #include <string> - #include <vector> -@@ -934,7 +934,7 @@ - // Try to optimise small scrolls - #ifndef UNDER_CE - const Sci::Line linesToMove = topLine - topLineNew; -- const bool performBlit = (abs(linesToMove) <= 10) && (paintState == notPainting); -+ const bool performBlit = (std::abs(linesToMove) <= 10) && (paintState == notPainting); - willRedrawAll = !performBlit; - #endif - SetTopLine(topLineNew); |