From 3ba9f505933cc9fb7e8ccf6e0cf04740235c2816 Mon Sep 17 00:00:00 2001
From: mitchell <70453897+667e-11@users.noreply.github.com>
Date: Mon, 6 Nov 2017 18:03:57 -0500
Subject: Backported bugfixes and changes from Scintilla 4.0.0 to 4.0.2.

---
 src/scintilla_backports/6317_82cb780a04d1.patch | 53 +++++++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 src/scintilla_backports/6317_82cb780a04d1.patch

(limited to 'src/scintilla_backports/6317_82cb780a04d1.patch')

diff --git a/src/scintilla_backports/6317_82cb780a04d1.patch b/src/scintilla_backports/6317_82cb780a04d1.patch
new file mode 100644
index 00000000..f3660d1b
--- /dev/null
+++ b/src/scintilla_backports/6317_82cb780a04d1.patch
@@ -0,0 +1,53 @@
+# HG changeset patch
+# User Neil <nyamatongwe@gmail.com>
+# Date 1497328847 -36000
+# Node ID 82cb780a04d12256758fc545b35779dc971d2de6
+# Parent  44fa26c9177437cd9d12ecbed3c9d6f9e1985a89
+Bug [#1949]. Fix drawing failure in wrap mode for delete to start/end of line.
+
+diff -r 44fa26c91774 -r 82cb780a04d1 doc/ScintillaHistory.html
+--- a/doc/ScintillaHistory.html	Tue Jun 13 14:33:53 2017 +1000
++++ b/doc/ScintillaHistory.html	Tue Jun 13 14:40:47 2017 +1000
+@@ -547,6 +547,11 @@
+ 	<a href="http://sourceforge.net/p/scintilla/bugs/1919/">Bug #1919</a>.
+ 	</li>
+ 	<li>
++	Fix drawing failure when in wrap mode for delete to start/end of line which
++	affects later lines but did not redraw them.
++	<a href="http://sourceforge.net/p/scintilla/bugs/1949/">Bug #1949</a>.
++	</li>
++	<li>
+ 	On Qt, mouse tracking is reenabled when the window is reshown.
+ 	<a href="http://sourceforge.net/p/scintilla/bugs/1948/">Bug #1948</a>.
+ 	</li>
+diff -r 44fa26c91774 -r 82cb780a04d1 src/Editor.cxx
+--- a/src/Editor.cxx	Tue Jun 13 14:33:53 2017 +1000
++++ b/src/Editor.cxx	Tue Jun 13 14:40:47 2017 +1000
+@@ -818,8 +818,11 @@
+ 	const Sci::Line currentLine = pdoc->LineFromPosition(newPos.Position());
+ 	if (ensureVisible) {
+ 		// In case in need of wrapping to ensure DisplayFromDoc works.
+-		if (currentLine >= wrapPending.start)
+-			WrapLines(wsAll);
++		if (currentLine >= wrapPending.start) {
++			if (WrapLines(wsAll)) {
++				Redraw();
++			}
++		}
+ 		XYScrollPosition newXY = XYScrollToMakeVisible(
+ 			SelectionRange(posDrag.IsValid() ? posDrag : newPos), xysDefault);
+ 		if (previousPos.IsValid() && (newXY.xOffset == xOffset)) {
+@@ -5290,8 +5293,11 @@
+ void Editor::EnsureLineVisible(Sci::Line lineDoc, bool enforcePolicy) {
+ 
+ 	// In case in need of wrapping to ensure DisplayFromDoc works.
+-	if (lineDoc >= wrapPending.start)
+-		WrapLines(wsAll);
++	if (lineDoc >= wrapPending.start) {
++		if (WrapLines(wsAll)) {
++			Redraw();
++		}
++	}
+ 
+ 	if (!cs.GetVisible(lineDoc)) {
+ 		// Back up to find a non-blank line
-- 
cgit v1.2.3