From 5b38c6a75744db4173f07ec5e71d2067931c8bd1 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Tue, 28 Feb 2017 10:38:51 +0200 Subject: [PATCH] Update Scintilla to v3.7.3. --- scintilla/cppcheck.suppress | 3 - scintilla/doc/ScintillaDoc.html | 14 +-- scintilla/doc/ScintillaDownload.html | 10 +-- scintilla/doc/ScintillaHistory.html | 89 ++++++++++++++++++- scintilla/doc/index.html | 9 +- scintilla/include/SciLexer.h | 4 + scintilla/include/Scintilla.iface | 8 +- scintilla/lexers/LexDiff.cxx | 4 +- scintilla/lexers/LexLua.cxx | 4 +- scintilla/lexers/LexMatlab.cxx | 33 +++++-- scintilla/lexers/LexPython.cxx | 123 +++++++++++++++++++++------ scintilla/lexlib/WordList.cxx | 10 +-- scintilla/scripts/FileGenerator.py | 44 ++++++++++ scintilla/scripts/HeaderOrder.txt | 2 + scintilla/scripts/LexGen.py | 76 ++++++++++++++++- scintilla/scripts/ScintillaData.py | 28 ++++++ scintilla/src/Document.cxx | 2 +- scintilla/src/Document.h | 2 +- scintilla/src/EditView.cxx | 10 ++- scintilla/src/EditView.h | 2 +- scintilla/src/Editor.cxx | 9 +- scintilla/src/ScintillaBase.cxx | 2 +- scintilla/src/XPM.cxx | 2 +- scintilla/src/XPM.h | 2 +- scintilla/version.txt | 2 +- 25 files changed, 407 insertions(+), 87 deletions(-) diff --git a/scintilla/cppcheck.suppress b/scintilla/cppcheck.suppress index 8f777b95..0def2841 100644 --- a/scintilla/cppcheck.suppress +++ b/scintilla/cppcheck.suppress @@ -8,9 +8,6 @@ useInitializationList // Some non-explicit constructors are used for conversions or are private to lexers noExplicitConstructor -// cppcheck does not understand private methods can be called from static methods -unusedPrivateFunction:scintilla/win32/PlatWin.cxx - // ScintillaDocument is providing an API and there are no consumers of the API inside Scintilla unusedFunction:scintilla/qt/ScintillaEdit/ScintillaDocument.cpp diff --git a/scintilla/doc/ScintillaDoc.html b/scintilla/doc/ScintillaDoc.html index 05145f4f..a29bfe61 100644 --- a/scintilla/doc/ScintillaDoc.html +++ b/scintilla/doc/ScintillaDoc.html @@ -1536,8 +1536,8 @@

Multiple Selection and Virtual SpaceSCI_GETSELECTIONS → int
SCI_GETSELECTIONEMPTY → bool
SCI_CLEARSELECTIONS
- SCI_SETSELECTION(int caret, int anchor) → int
- SCI_ADDSELECTION(int caret, int anchor) → int
+ SCI_SETSELECTION(int caret, int anchor)
+ SCI_ADDSELECTION(int caret, int anchor)
SCI_DROPSELECTIONN(int selection)
SCI_SETMAINSELECTION(int selection)
SCI_GETMAINSELECTION → int
@@ -1667,11 +1667,11 @@

Multiple Selection and Virtual Space

- SCI_SETSELECTION(int caret, int anchor) → int
+ SCI_SETSELECTION(int caret, int anchor)
Set a single selection from anchor to caret as the only selection.

- SCI_ADDSELECTION(int caret, int anchor) → int
+ SCI_ADDSELECTION(int caret, int anchor)
Add a new selection from anchor to caret as the main selection retaining all other selections as additional selections. Since there is always at least one selection, to set a list of selections, the first selection should be @@ -5374,7 +5374,7 @@

Popup edit menu

SC_POPUP_NEVER - 0x01 + 0 Never show default editing menu. @@ -5383,7 +5383,7 @@

Popup edit menu

SC_POPUP_ALL - 0x02 + 1 Show default editing menu if clicking on scintilla. @@ -5392,7 +5392,7 @@

Popup edit menu

SC_POPUP_TEXT - 0x04 + 2 Show default editing menu only if clicking on text area. diff --git a/scintilla/doc/ScintillaDownload.html b/scintilla/doc/ScintillaDownload.html index c86e4439..f48f4abd 100644 --- a/scintilla/doc/ScintillaDownload.html +++ b/scintilla/doc/ScintillaDownload.html @@ -26,9 +26,9 @@ @@ -42,7 +42,7 @@

containing very few restrictions.

- Release 3.7.2 + Release 3.7.3

Source Code @@ -50,8 +50,8 @@

The source code package contains all of the source code for Scintilla but no binary executable code and is available in Instructions for building on both Windows and Linux are included in the readme file.

diff --git a/scintilla/doc/ScintillaHistory.html b/scintilla/doc/ScintillaHistory.html index a8c7c15f..566778bc 100644 --- a/scintilla/doc/ScintillaHistory.html +++ b/scintilla/doc/ScintillaHistory.html @@ -501,11 +501,13 @@

- + + +
- + Windows   - + GTK+/Linux   jedailey oirfeodent A-R-C-A
Roberto Rossi Kenny Liu Iain Clarkedesto
John Flatness

@@ -517,17 +519,98 @@

Icons Copyright(C) 1998 by Dean S. Jones
+

+ Release 3.7.4 +

+

Release 3.7.3

Release 3.7.2 diff --git a/scintilla/doc/index.html b/scintilla/doc/index.html index 84c8dc2d..c559b5ff 100644 --- a/scintilla/doc/index.html +++ b/scintilla/doc/index.html @@ -9,7 +9,7 @@ - +