diff options
| author |   mitchell <70453897+667e-11@users.noreply.github.com> | 2017-06-17 18:09:23 -0400 |
|---|---|---|
| committer | mitchell <70453897+667e-11@users.noreply.github.com> | 2017-06-17 18:09:23 -0400 |
| commit | c79314c9bd8efc6e521664bf4de182370c436c09 (patch) | |
| tree | 9ce81d4de67843af7f293c2dc556e9c6e257bcb9 /src/scintilla_backports/6161_e7ca78c6f29c.patch | |
| parent | b82ab307b7ee8bcc547aa076c17355ad7bb7ea24 (diff) | |
| download | textadept-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/6161_e7ca78c6f29c.patch')
| -rw-r--r-- | src/scintilla_backports/6161_e7ca78c6f29c.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/src/scintilla_backports/6161_e7ca78c6f29c.patch b/src/scintilla_backports/6161_e7ca78c6f29c.patch new file mode 100644 index 00000000..cd8e88d4 --- /dev/null +++ b/src/scintilla_backports/6161_e7ca78c6f29c.patch @@ -0,0 +1,27 @@ +# HG changeset patch +# User Neil <nyamatongwe@gmail.com> +# Date 1491209937 -36000 +# Node ID e7ca78c6f29cf64c8c26e3e6ee2d63f4dbd48909 +# Parent a1a9cde519976fa12e46224d6cd57483bc4633ae +Prevent warning from MSVC Code Analysis. + +diff -r a1a9cde51997 -r e7ca78c6f29c src/Decoration.cxx +--- a/src/Decoration.cxx Sun Apr 02 08:17:38 2017 +1000 ++++ b/src/Decoration.cxx Mon Apr 03 18:58:57 2017 +1000 +@@ -89,10 +89,12 @@ + decoToDelete = root; + root = root->Next(); + } else { +- Decoration *deco=root; +- while (deco->Next() && !decoToDelete) { +- if (deco->Next() && deco->Next()->Indicator() == indicator) { +- decoToDelete = deco->Next(); ++ Decoration *deco = root; ++ while (deco && deco->Next() && !decoToDelete) { ++ // decoNext ensures no warning from MSVC Code Analysis ++ Decoration *decoNext = deco->Next(); ++ if (decoNext && deco->Next()->Indicator() == indicator) { ++ decoToDelete = decoNext; + deco->next = decoToDelete->Next(); + } else { + deco = deco->Next(); |