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/6342_52f12c3eebcd.patch | 69 +++++++++++++++++++++++++
1 file changed, 69 insertions(+)
create mode 100644 src/scintilla_backports/6342_52f12c3eebcd.patch
(limited to 'src/scintilla_backports/6342_52f12c3eebcd.patch')
diff --git a/src/scintilla_backports/6342_52f12c3eebcd.patch b/src/scintilla_backports/6342_52f12c3eebcd.patch
new file mode 100644
index 00000000..6f7a340a
--- /dev/null
+++ b/src/scintilla_backports/6342_52f12c3eebcd.patch
@@ -0,0 +1,69 @@
+# HG changeset patch
+# User Justin Dailey
+# Date 1499559915 -36000
+# Node ID 52f12c3eebcd37757503136e1c3a3c693120c50b
+# Parent 040330eec86d765ffdaffe85e55b30c794302c2b
+Bug [#1955]. The data parameter to ILoader::AddData made const.
+
+diff -r 040330eec86d -r 52f12c3eebcd doc/ScintillaDoc.html
+--- a/doc/ScintillaDoc.html Sun Jul 09 10:03:53 2017 +1000
++++ b/doc/ScintillaDoc.html Sun Jul 09 10:25:15 2017 +1000
+@@ -5761,7 +5761,7 @@
+ public:
+ virtual int SCI_METHOD Release() = 0;
+ // Returns a status code from SC_STATUS_*
+- virtual int SCI_METHOD AddData(char *data, int length) = 0;
++ virtual int SCI_METHOD AddData(const char *data, Sci_Position length) = 0;
+ virtual void * SCI_METHOD ConvertToDocument() = 0;
+ };
+
+diff -r 040330eec86d -r 52f12c3eebcd doc/ScintillaHistory.html
+--- a/doc/ScintillaHistory.html Sun Jul 09 10:03:53 2017 +1000
++++ b/doc/ScintillaHistory.html Sun Jul 09 10:25:15 2017 +1000
+@@ -542,6 +542,10 @@
+ An SCN_AUTOCSELECTIONCHANGE notification is sent when items are highlighted in an autocompletion or user list.
+
+
++ The data parameter to ILoader::AddData made const.
++ Bug #1955.
++
++
+ SciTE's embedded Lua interpreter updated to Lua 5.3.
+
+
+diff -r 040330eec86d -r 52f12c3eebcd include/ILexer.h
+--- a/include/ILexer.h Sun Jul 09 10:03:53 2017 +1000
++++ b/include/ILexer.h Sun Jul 09 10:25:15 2017 +1000
+@@ -85,7 +85,7 @@
+ public:
+ virtual int SCI_METHOD Release() = 0;
+ // Returns a status code from SC_STATUS_*
+- virtual int SCI_METHOD AddData(char *data, Sci_Position length) = 0;
++ virtual int SCI_METHOD AddData(const char *data, Sci_Position length) = 0;
+ virtual void * SCI_METHOD ConvertToDocument() = 0;
+ };
+
+diff -r 040330eec86d -r 52f12c3eebcd src/Document.cxx
+--- a/src/Document.cxx Sun Jul 09 10:03:53 2017 +1000
++++ b/src/Document.cxx Sun Jul 09 10:25:15 2017 +1000
+@@ -1138,7 +1138,7 @@
+ insertion.assign(s, length);
+ }
+
+-int SCI_METHOD Document::AddData(char *data, Sci_Position length) {
++int SCI_METHOD Document::AddData(const char *data, Sci_Position length) {
+ try {
+ Sci::Position position = static_cast(Length());
+ InsertString(position, data, static_cast(length));
+diff -r 040330eec86d -r 52f12c3eebcd src/Document.h
+--- a/src/Document.h Sun Jul 09 10:03:53 2017 +1000
++++ b/src/Document.h Sun Jul 09 10:25:15 2017 +1000
+@@ -316,7 +316,7 @@
+ bool DeleteChars(Sci::Position pos, Sci::Position len);
+ Sci::Position InsertString(Sci::Position position, const char *s, Sci::Position insertLength);
+ void ChangeInsertion(const char *s, Sci::Position length);
+- int SCI_METHOD AddData(char *data, Sci_Position length);
++ int SCI_METHOD AddData(const char *data, Sci_Position length);
+ void * SCI_METHOD ConvertToDocument();
+ Sci::Position Undo();
+ Sci::Position Redo();
--
cgit v1.2.3