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/6215_1f02cb4a5b26.patch | 33 -------------------------
 1 file changed, 33 deletions(-)
 delete mode 100644 src/scintilla_backports/6215_1f02cb4a5b26.patch

(limited to 'src/scintilla_backports/6215_1f02cb4a5b26.patch')

diff --git a/src/scintilla_backports/6215_1f02cb4a5b26.patch b/src/scintilla_backports/6215_1f02cb4a5b26.patch
deleted file mode 100644
index 093df2cb..00000000
--- a/src/scintilla_backports/6215_1f02cb4a5b26.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-# HG changeset patch
-# User Neil <nyamatongwe@gmail.com>
-# Date 1493072833 -36000
-# Node ID 1f02cb4a5b26d6774b09fc59f8fb4fbd1098c5ef
-# Parent  23af3d7bb75a20bd0e3c0ccf3f341b9defa070e5
-Bug [#1940]. Canceling modes with the Esc key preserves a rectangular selection.
-
-diff -r 23af3d7bb75a -r 1f02cb4a5b26 doc/ScintillaHistory.html
---- a/doc/ScintillaHistory.html	Mon Apr 24 08:36:05 2017 +1000
-+++ b/doc/ScintillaHistory.html	Tue Apr 25 08:27:13 2017 +1000
-@@ -560,6 +560,10 @@
- 	<a href="http://sourceforge.net/p/scintilla/bugs/1931/">Bug #1931</a>.
- 	</li>
- 	<li>
-+	Canceling modes with the Esc key preserves a rectangular selection.
-+	<a href="http://sourceforge.net/p/scintilla/bugs/1940/">Bug #1940</a>.
-+	</li>
-+	<li>
- 	On Cocoa, a leak of mouse tracking areas was fixed.
- 	</li>
- 	<li>
-diff -r 23af3d7bb75a -r 1f02cb4a5b26 src/Editor.cxx
---- a/src/Editor.cxx	Mon Apr 24 08:36:05 2017 +1000
-+++ b/src/Editor.cxx	Tue Apr 25 08:27:13 2017 +1000
-@@ -3745,7 +3745,7 @@
- 	case SCI_CANCEL:            	// Cancel any modes - handled in subclass
- 		// Also unselect text
- 		CancelModes();
--		if (sel.Count() > 1) {
-+		if ((sel.Count() > 1) && !sel.IsRectangular()) {
- 			// Drop additional selections
- 			InvalidateWholeSelection();
- 			sel.DropAdditionalRanges();
-- 
cgit v1.2.3