aboutsummaryrefslogtreecommitdiff
path: root/src/scintilla_backports/6170_df221375187c.patch
diff options
context:
space:
mode:
authormitchell <70453897+667e-11@users.noreply.github.com>2017-06-17 18:09:23 -0400
committermitchell <70453897+667e-11@users.noreply.github.com>2017-06-17 18:09:23 -0400
commitc79314c9bd8efc6e521664bf4de182370c436c09 (patch)
tree9ce81d4de67843af7f293c2dc556e9c6e257bcb9 /src/scintilla_backports/6170_df221375187c.patch
parentb82ab307b7ee8bcc547aa076c17355ad7bb7ea24 (diff)
downloadtextadept-c79314c9bd8efc6e521664bf4de182370c436c09.tar.gz
textadept-c79314c9bd8efc6e521664bf4de182370c436c09.zip
Effectively updated to Scintilla 3.7.5 with select backports to 3.7.3.
Diffstat (limited to 'src/scintilla_backports/6170_df221375187c.patch')
-rw-r--r--src/scintilla_backports/6170_df221375187c.patch25
1 files changed, 25 insertions, 0 deletions
diff --git a/src/scintilla_backports/6170_df221375187c.patch b/src/scintilla_backports/6170_df221375187c.patch
new file mode 100644
index 00000000..28479b0a
--- /dev/null
+++ b/src/scintilla_backports/6170_df221375187c.patch
@@ -0,0 +1,25 @@
+# HG changeset patch
+# User Neil <nyamatongwe@gmail.com>
+# Date 1491548892 -36000
+# Node ID df221375187cab18a3e1c73ae83fa46805bf98db
+# Parent ef932abba46c57933959a83bd63fafc429d35259
+Allowing assigning Windows and ensure cursorLast is initialized.
+
+diff -r ef932abba46c -r df221375187c include/Platform.h
+--- a/include/Platform.h Thu Apr 06 21:04:52 2017 +1000
++++ b/include/Platform.h Fri Apr 07 17:08:12 2017 +1000
+@@ -363,6 +363,14 @@
+ virtual ~Window();
+ Window &operator=(WindowID wid_) {
+ wid = wid_;
++ cursorLast = cursorInvalid;
++ return *this;
++ }
++ Window &operator=(const Window &other) {
++ if (this != &other) {
++ wid = other.wid;
++ cursorLast = other.cursorLast;
++ }
+ return *this;
+ }
+ WindowID GetID() const { return wid; }