aboutsummaryrefslogtreecommitdiff
path: root/src/scintilla_backports/6171_99e46ea84433.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/6171_99e46ea84433.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/6171_99e46ea84433.patch')
-rw-r--r--src/scintilla_backports/6171_99e46ea84433.patch25
1 files changed, 25 insertions, 0 deletions
diff --git a/src/scintilla_backports/6171_99e46ea84433.patch b/src/scintilla_backports/6171_99e46ea84433.patch
new file mode 100644
index 00000000..4b183244
--- /dev/null
+++ b/src/scintilla_backports/6171_99e46ea84433.patch
@@ -0,0 +1,25 @@
+# HG changeset patch
+# User Neil <nyamatongwe@gmail.com>
+# Date 1491548935 -36000
+# Node ID 99e46ea84433f95e568fb9fdc7d4a92869e823ab
+# Parent df221375187cab18a3e1c73ae83fa46805bf98db
+Check index before checking value at index.
+
+diff -r df221375187c -r 99e46ea84433 src/CellBuffer.cxx
+--- a/src/CellBuffer.cxx Fri Apr 07 17:08:12 2017 +1000
++++ b/src/CellBuffer.cxx Fri Apr 07 17:08:55 2017 +1000
+@@ -348,12 +348,12 @@
+
+ int UndoHistory::StartRedo() {
+ // Drop any leading startAction
+- if (actions[currentAction].at == startAction && currentAction < maxAction)
++ if (currentAction < maxAction && actions[currentAction].at == startAction)
+ currentAction++;
+
+ // Count the steps in this action
+ int act = currentAction;
+- while (actions[act].at != startAction && act < maxAction) {
++ while (act < maxAction && actions[act].at != startAction) {
+ act++;
+ }
+ return act - currentAction;