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/6340_ebec660dcf48.patch | 35 +++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 src/scintilla_backports/6340_ebec660dcf48.patch

(limited to 'src/scintilla_backports/6340_ebec660dcf48.patch')

diff --git a/src/scintilla_backports/6340_ebec660dcf48.patch b/src/scintilla_backports/6340_ebec660dcf48.patch
new file mode 100644
index 00000000..ba1d1e37
--- /dev/null
+++ b/src/scintilla_backports/6340_ebec660dcf48.patch
@@ -0,0 +1,35 @@
+# HG changeset patch
+# User Neil <nyamatongwe@gmail.com>
+# Date 1499397575 -36000
+# Node ID ebec660dcf48ec92301441140550f67d3e7ceb29
+# Parent  79f86be9e988efc5b1462ae549c271c4f3a1b82c
+Bug [#1949]. Fix drawing failure in wrap mode for GTK+ 2.x.
+
+diff -r 79f86be9e988 -r ebec660dcf48 doc/ScintillaHistory.html
+--- a/doc/ScintillaHistory.html	Fri Jul 07 12:55:23 2017 +1000
++++ b/doc/ScintillaHistory.html	Fri Jul 07 13:19:35 2017 +1000
+@@ -572,6 +572,7 @@
+ 	<li>
+ 	Fix drawing failure when in wrap mode for delete to start/end of line which
+ 	affects later lines but did not redraw them.
++	Also fixed drawing for wrap mode on GTK+ 2.x.
+ 	<a href="http://sourceforge.net/p/scintilla/bugs/1949/">Bug #1949</a>.
+ 	</li>
+ 	<li>
+diff -r 79f86be9e988 -r ebec660dcf48 gtk/ScintillaGTK.cxx
+--- a/gtk/ScintillaGTK.cxx	Fri Jul 07 12:55:23 2017 +1000
++++ b/gtk/ScintillaGTK.cxx	Fri Jul 07 13:19:35 2017 +1000
+@@ -2599,11 +2599,12 @@
+ 			Paint(surfaceWindow.get(), rcPaint);
+ 			surfaceWindow->Release();
+ 			cairo_destroy(cr);
+ 		}
+-		if (paintState == paintAbandoned) {
++		if ((paintState == paintAbandoned) || repaintFullWindow) {
+ 			// Painting area was insufficient to cover new styling or brace highlight positions
+ 			FullPaint();
+ 		}
+ 		paintState = notPainting;
++		repaintFullWindow = false;
+ 
+ 		if (rgnUpdate) {
-- 
cgit v1.2.3