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/6097_7f22895eaddb.patch | 34 -------------------------
 1 file changed, 34 deletions(-)
 delete mode 100644 src/scintilla_backports/6097_7f22895eaddb.patch

(limited to 'src/scintilla_backports/6097_7f22895eaddb.patch')

diff --git a/src/scintilla_backports/6097_7f22895eaddb.patch b/src/scintilla_backports/6097_7f22895eaddb.patch
deleted file mode 100644
index 2ffe1923..00000000
--- a/src/scintilla_backports/6097_7f22895eaddb.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-# HG changeset patch
-# User Neil <nyamatongwe@gmail.com>
-# Date 1487827984 -39600
-# Node ID 7f22895eaddb6584d488ed2e606d5d0e930db22c
-# Parent  cc79ed8e4f8274ba1242150f36e2ab0b40ed68f4
-Bug [#1905]. Fix stream selection mode when moving caret up or down.
-
-diff -r cc79ed8e4f82 -r 7f22895eaddb doc/ScintillaHistory.html
---- a/doc/ScintillaHistory.html	Wed Feb 22 16:35:01 2017 +1100
-+++ b/doc/ScintillaHistory.html	Thu Feb 23 16:33:04 2017 +1100
-@@ -527,6 +527,10 @@
- 	Released 19 February 2017.
- 	</li>
- 	<li>
-+	Fix to stream selection mode when moving caret up or down.
-+	<a href="http://sourceforge.net/p/scintilla/bugs/1905/">Bug #1905</a>.
-+	</li>
-+	<li>
- 	Fix to prevent double scrolling on GTK+ with X11.
- 	<a href="http://sourceforge.net/p/scintilla/bugs/1901/">Bug #1901</a>.
- 	</li>
-diff -r cc79ed8e4f82 -r 7f22895eaddb src/Editor.cxx
---- a/src/Editor.cxx	Wed Feb 22 16:35:01 2017 +1100
-+++ b/src/Editor.cxx	Thu Feb 23 16:33:04 2017 +1100
-@@ -3111,6 +3111,9 @@
- }
- 
- void Editor::CursorUpOrDown(int direction, Selection::selTypes selt) {
-+	if ((selt == Selection::noSel) && sel.MoveExtends()) {
-+		selt = Selection::selStream;
-+	}
- 	SelectionPosition caretToUse = sel.Range(sel.Main()).caret;
- 	if (sel.IsRectangular()) {
- 		if (selt ==  Selection::noSel) {
-- 
cgit v1.2.3