diff options
author | 2018-03-12 18:20:24 -0400 | |
---|---|---|
committer | 2018-03-12 18:20:24 -0400 | |
commit | ec391b6bfe8d87f4fb1bbb2a4e6033eaad9f4672 (patch) | |
tree | 3e465bb700187ef104363c31525a73a4147c0edb /src/scintilla_backports/6108_b833c0659497.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/6108_b833c0659497.patch')
-rw-r--r-- | src/scintilla_backports/6108_b833c0659497.patch | 74 |
1 files changed, 0 insertions, 74 deletions
diff --git a/src/scintilla_backports/6108_b833c0659497.patch b/src/scintilla_backports/6108_b833c0659497.patch deleted file mode 100644 index b38d426a..00000000 --- a/src/scintilla_backports/6108_b833c0659497.patch +++ /dev/null @@ -1,74 +0,0 @@ -# HG changeset patch -# User Neil Hodgson <nyamatongwe@gmail.com> -# Date 1488583798 -39600 -# Node ID b833c0659497438d3638a1a30ef4c604123f9e3e -# Parent d4f7d1439daa636ffe50cec516667627e04174a7 -Fix minor issues in interface definitions. - -diff -r d4f7d1439daa -r b833c0659497 include/Scintilla.iface ---- a/include/Scintilla.iface Sat Mar 04 10:28:39 2017 +1100 -+++ b/include/Scintilla.iface Sat Mar 04 10:29:58 2017 +1100 -@@ -415,8 +415,7 @@ - # How many margins are there?. - get int GetMargins=2253(,) - --# Styles in range 32..38 are predefined for parts of the UI and are not used as normal styles. --# Style 39 is for future use. -+# Styles in range 32..39 are predefined for parts of the UI and are not used as normal styles. - enu StylesCommon=STYLE_ - val STYLE_DEFAULT=32 - val STYLE_LINENUMBER=33 -@@ -1215,7 +1214,7 @@ - # Switch a header line between expanded and contracted and show some text after the line. - fun void ToggleFoldShowText=2700(int line, string text) - --enu foldDisplayTextStyle=SC_FOLDDISPLAYTEXTSTYLE_ -+enu FoldDisplayTextStyle=SC_FOLDDISPLAYTEXT_ - val SC_FOLDDISPLAYTEXT_HIDDEN=0 - val SC_FOLDDISPLAYTEXT_STANDARD=1 - val SC_FOLDDISPLAYTEXT_BOXED=2 -@@ -1832,6 +1831,7 @@ - fun void WordPartRightExtend=2393(,) - - # Constants for use with SetVisiblePolicy, similar to SetCaretPolicy. -+enu VisiblePolicy=VISIBLE_ - val VISIBLE_SLOP=0x01 - val VISIBLE_STRICT=0x04 - # Set the way the display area is determined when a particular line -@@ -1844,8 +1844,10 @@ - # Delete forwards from the current position to the end of the line. - fun void DelLineRight=2396(,) - --# Get and Set the xOffset (ie, horizontal scroll position). -+# Set the xOffset (ie, horizontal scroll position). - set void SetXOffset=2397(int xOffset,) -+ -+# Get the xOffset (ie, horizontal scroll position). - get int GetXOffset=2398(,) - - # Set the last x chosen value to be the caret x position. -@@ -2117,6 +2119,7 @@ - # Duplicate the selection. If selection empty duplicate the line containing the caret. - fun void SelectionDuplicate=2469(,) - -+enu Alpha=SC_ALPHA_ - val SC_ALPHA_TRANSPARENT=0 - val SC_ALPHA_OPAQUE=255 - val SC_ALPHA_NOALPHA=256 -@@ -2515,6 +2518,7 @@ - # Scroll to end of document. - fun void ScrollToEnd=2629(,) - -+enu Technology=SC_TECHNOLOGY_ - val SC_TECHNOLOGY_DEFAULT=0 - val SC_TECHNOLOGY_DIRECTWRITE=1 - val SC_TECHNOLOGY_DIRECTWRITERETAIN=2 -@@ -4811,7 +4815,7 @@ - evt void MarginClick=2010(int modifiers, int position, int margin) - evt void NeedShown=2011(int position, int length) - evt void Painted=2013(void) --evt void UserListSelection=2014(int listType, string text, int positionint, int ch, CompletionMethods listCompletionMethod) -+evt void UserListSelection=2014(int listType, string text, int position, int ch, CompletionMethods listCompletionMethod) - evt void URIDropped=2015(string text) - evt void DwellStart=2016(int position, int x, int y) - evt void DwellEnd=2017(int position, int x, int y) |