Skip to content
This repository has been archived by the owner on Aug 12, 2018. It is now read-only.

Commit

Permalink
Update Scintilla to v3.5.7.
Browse files Browse the repository at this point in the history
  • Loading branch information
@XhmikosR
XhmikosR committed Jun 22, 2015
1 parent aaced3e commit 8104282
Show file tree
Hide file tree
Showing 20 changed files with 395 additions and 138 deletions.
11 changes: 7 additions & 4 deletions scintilla/cppcheck.suppress
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
// File to suppress cppcheck warnings for files that will not be fixed.
// Does not suppress warnings where an additional occurrence of the warning may be of interest.
// Does not suppress false positives from cppcheck.

// Coding style is to use assignments in constructor when there are many
// members to initialize or the initialization is complex or has comments.
useInitializationList

// Some non-explicit constructors are used for conversions or are private to lexers
noExplicitConstructor
noExplicitCopyMoveConstructor

// cppcheck does not understand private methods can be called from static methods
unusedPrivateFunction:scintilla/win32/PlatWin.cxx

// Suppress most lexer warnings since the lexers are maintained by others
useInitializationList:scintilla/lexers/LexAsm.cxx
useInitializationList:scintilla/lexers/LexBasic.cxx
Expand Down Expand Up @@ -35,8 +41,5 @@ invalidscanf:scintilla/lexers/LexTCMD.cxx
variableScope:scintilla/lexers/LexTeX.cxx
variableScope:scintilla/lexers/LexVHDL.cxx

// Suppress C-style pointer casting for Qt code as won't be changing
cstyleCast:scintilla/qt/ScintillaEdit/ScintillaDocument.cpp

// Suppress everything in catch.hpp as won't be changing
*:scintilla/test/unit/catch.hpp
69 changes: 69 additions & 0 deletions scintilla/doc/Privacy.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
<?xml version="1.0"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta name="generator" content="SciTE" />
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
<title>
Privacy Policy
</title>
</head>
<body bgcolor="#FFFFFF" text="#000000">
<table bgcolor="#000000" width="100%" cellspacing="0" cellpadding="0" border="0">
<tr>
<td>
<img src="SciTEIco.png" border="3" height="64" width="64" alt="Scintilla icon" />
</td>
<td>
<a href="index.html" style="color:white;text-decoration:none"><font size="5">Scintilla
and SciTE</font></a>
</td>
</tr>
</table>
<h2>
Privacy Policy for scintilla.org
</h2>
<h3>
Information Collected
</h3>
<p>
Logs are collected to allow analysis of which pages are viewed.
The advertisements collect viewing information through Google Analytics which is
used by Google and advertisers.
No personally identifiable information is collected by scintilla.org.
</p>
<h3>
External Links
</h3>
<p>
Other web sites are linked to from this site.
These web sites have their own privacy policies which may differ significantly to those of scintilla.org.
</p>
<h3>
Cookies
</h3>
<p>
A cookie is a text file placed on the hard drive of a computer by some web pages which is used to remember
when a particular user returns to that site.
The advertisements shown on the main pages may use cookies.
</p>
<h3>
Contact
</h3>
<p>
This web site is the responsibility of Neil Hodgson.
Most queries about the site contents should go to one of the mailing lists mentioned on the main pages.
Queries about the privacy policy may be sent to neilh @ scintilla.org.
</p>
<h3>
Changes to this Policy
</h3>
<p>
This policy may change. If it does then this page will be updated and the date at the bottom will change.
</p>
<p>
This policy was last updated 2 June 2015.
</p>
</body>
</html>
38 changes: 31 additions & 7 deletions scintilla/doc/ScintillaDoc.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@

<h1>Scintilla Documentation</h1>

<p>Last edited 22 February 2015 NH</p>
<p>Last edited 11 June 2015 NH</p>

<p>There is <a class="jump" href="Design.html">an overview of the internal design of
Scintilla</a>.<br />
Expand Down Expand Up @@ -641,6 +641,7 @@ <h3 id="SearchAndReplaceUsingTheTarget">Search and replace using the target</h3>
<a class="message" href="#SCI_GETTARGETEND">SCI_GETTARGETEND</a><br />
<a class="message" href="#SCI_SETTARGETRANGE">SCI_SETTARGETRANGE(int start, int end)</a><br />
<a class="message" href="#SCI_TARGETFROMSELECTION">SCI_TARGETFROMSELECTION</a><br />
<a class="message" href="#SCI_TARGETWHOLEDOCUMENT">SCI_TARGETWHOLEDOCUMENT</a><br />
<a class="message" href="#SCI_SETSEARCHFLAGS">SCI_SETSEARCHFLAGS(int searchFlags)</a><br />
<a class="message" href="#SCI_GETSEARCHFLAGS">SCI_GETSEARCHFLAGS</a><br />
<a class="message" href="#SCI_SEARCHINTARGET">SCI_SEARCHINTARGET(int length, const char
Expand All @@ -667,6 +668,9 @@ <h3 id="SearchAndReplaceUsingTheTarget">Search and replace using the target</h3>
<p><b id="SCI_TARGETFROMSELECTION">SCI_TARGETFROMSELECTION</b><br />
Set the target start and end to the start and end positions of the selection.</p>

<p><b id="SCI_TARGETWHOLEDOCUMENT">SCI_TARGETWHOLEDOCUMENT</b><br />
Set the target start to the start of the document and target end to the end of the document.</p>

<p><b id="SCI_SETSEARCHFLAGS">SCI_SETSEARCHFLAGS(int searchFlags)</b><br />
<b id="SCI_GETSEARCHFLAGS">SCI_GETSEARCHFLAGS</b><br />
These get and set the <a class="jump" href="#searchFlags"><code>searchFlags</code></a> used by
Expand Down Expand Up @@ -1175,6 +1179,7 @@ <h2 id="SelectionAndInformation">Selection and information</h2>
onlyWordCharacters)</a><br />
<a class="message" href="#SCI_WORDSTARTPOSITION">SCI_WORDSTARTPOSITION(int position, bool
onlyWordCharacters)</a><br />
<a class="message" href="#SCI_ISRANGEWORD">SCI_ISRANGEWORD(int start, int end)</a><br />
<a class="message" href="#SCI_POSITIONBEFORE">SCI_POSITIONBEFORE(int position)</a><br />
<a class="message" href="#SCI_POSITIONAFTER">SCI_POSITIONAFTER(int position)</a><br />
<a class="message" href="#SCI_POSITIONRELATIVE">SCI_POSITIONRELATIVE(int position, int relative)</a><br />
Expand Down Expand Up @@ -1399,6 +1404,12 @@ <h2 id="SelectionAndInformation">Selection and information</h2>
sets the start or the search, which is forwards when searching for the end and backwards when
searching for the start.</p>

<p><b id="SCI_ISRANGEWORD">SCI_ISRANGEWORD(int start, int end)</b><br />
Is the range start..end a word or set of words? This message checks that start is at a word start transition and that
end is at a word end transition. It does not check whether there are any spaces inside the range.</p>

<a class="message" href="#SCI_ISRANGEWORD">SCI_ISRANGEWORD(int start, int end)</a><br />

<p>Set <code>onlyWordCharacters</code> to <code>true</code> (1) to stop searching at the first
non-word character in the search direction. If <code>onlyWordCharacters</code> is
<code>false</code> (0), the first character in the search direction sets the type of the search
Expand Down Expand Up @@ -1624,6 +1635,8 @@ <h2 id="MultipleSelectionAndVirtualSpace">Multiple Selection and Virtual Space</

<a class="message" href="#SCI_SWAPMAINANCHORCARET">SCI_SWAPMAINANCHORCARET</a><br />
<a class="message" href="#SCI_ROTATESELECTION">SCI_ROTATESELECTION</a><br />
<a class="message" href="#SCI_MULTIPLESELECTADDNEXT">SCI_MULTIPLESELECTADDNEXT</a><br />
<a class="message" href="#SCI_MULTIPLESELECTADDEACH">SCI_MULTIPLESELECTADDEACH</a><br />
</code>

<p>
Expand Down Expand Up @@ -1687,7 +1700,7 @@ <h2 id="MultipleSelectionAndVirtualSpace">Multiple Selection and Virtual Space</

<p>
<b id="SCI_GETSELECTIONS">SCI_GETSELECTIONS</b><br />
Return the number of selections currently active.</p>
Return the number of selections currently active. There is always at least one selection.</p>

<p>
<b id="SCI_GETSELECTIONEMPTY">SCI_GETSELECTIONEMPTY</b><br />
Expand Down Expand Up @@ -1738,7 +1751,7 @@ <h2 id="MultipleSelectionAndVirtualSpace">Multiple Selection and Virtual Space</
<b id="SCI_SETSELECTIONNEND">SCI_SETSELECTIONNEND(int selection, int pos)</b><br />
<b id="SCI_GETSELECTIONNEND">SCI_GETSELECTIONNEND(int selection)</b><br />
Set or query the start and end position of each already existing selection.
Mostly of use to query each range for its text.</p>
Mostly of use to query each range for its text. The selection parameter is zero-based. </p>

<p>
<b id="SCI_SETRECTANGULARSELECTIONCARET">SCI_SETRECTANGULARSELECTIONCARET(int pos)</b><br />
Expand Down Expand Up @@ -1789,9 +1802,17 @@ <h2 id="MultipleSelectionAndVirtualSpace">Multiple Selection and Virtual Space</
<p>
<b id="SCI_SWAPMAINANCHORCARET">SCI_SWAPMAINANCHORCARET</b><br />
<b id="SCI_ROTATESELECTION">SCI_ROTATESELECTION</b><br />
<b id="SCI_MULTIPLESELECTADDNEXT">SCI_MULTIPLESELECTADDNEXT</b><br />
<b id="SCI_MULTIPLESELECTADDEACH">SCI_MULTIPLESELECTADDEACH</b><br />
These commands may be assigned to keys to make it possible to manipulate multiple selections.
<code>SCI_SWAPMAINANCHORCARET</code> moves the caret to the opposite end of the main selection.
<code>SCI_ROTATESELECTION</code> makes the next selection be the main selection.
<code>SCI_ROTATESELECTION</code> makes the next selection be the main selection.<br />
<code>SCI_MULTIPLESELECTADDNEXT</code> adds the next occurrence of the main selection
within the target to the set of selections as main. If the current selection is empty then select word around caret.
The current <a class="jump" href="#searchFlags"><code>searchFlags</code></a>
are used so the application may choose case sensitivity and word search options.<br />
<code>SCI_MULTIPLESELECTADDEACH</code> is similar to
<code>SCI_MULTIPLESELECTADDNEXT</code> but adds multiple occurrences instead of just one.
</p>

<h2 id="ScrollingAndAutomaticScrolling">Scrolling and automatic scrolling</h2>
Expand Down Expand Up @@ -2372,18 +2393,21 @@ <h2 id="Styling">Styling</h2>
The unused argument was used in earlier versions but is now ignored.
After
<code>SCI_STARTSTYLING</code>, send multiple <code>SCI_SETSTYLING</code> messages for each
lexical entity to style.</p>
lexical entity to style or send <code>SCI_SETSTYLINGEX</code> to style in blocks.</p>

<p><b id="SCI_SETSTYLING">SCI_SETSTYLING(int length, int style)</b><br />
This message sets the style of <code>length</code> characters starting at the styling position
and then increases the styling position by <code>length</code>, ready for the next call.<br />
and then increases the styling position by <code>length</code>, ready for the next call.
<code>SCI_STARTSTYLING</code> should be called before the first call to this.
</p>

<p><b id="SCI_SETSTYLINGEX">SCI_SETSTYLINGEX(int length, const char *styles)</b><br />
As an alternative to <code>SCI_SETSTYLING</code>, which applies the same style to each byte,
you can use this message which specifies the styles for each of <code>length</code> bytes from
the styling position and then increases the styling position by <code>length</code>, ready for
the next call.</p>
the next call.
<code>SCI_STARTSTYLING</code> should be called before the first call to this.
</p>

<p><b id="SCI_SETLINESTATE">SCI_SETLINESTATE(int line, int value)</b><br />
<b id="SCI_GETLINESTATE">SCI_GETLINESTATE(int line)</b><br />
Expand Down
10 changes: 5 additions & 5 deletions scintilla/doc/ScintillaDownload.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
<table bgcolor="#CCCCCC" width="100%" cellspacing="0" cellpadding="8" border="0">
<tr>
<td>
<font size="4"> <a href="http://prdownloads.sourceforge.net/scintilla/scintilla356.zip?download">
<font size="4"> <a href="http://www.scintilla.org/scintilla357.zip">
Windows</a>&nbsp;&nbsp;
<a href="http://prdownloads.sourceforge.net/scintilla/scintilla356.tgz?download">
<a href="http://www.scintilla.org/scintilla357.tgz">
GTK+/Linux</a>&nbsp;&nbsp;
</font>
</td>
Expand All @@ -41,16 +41,16 @@ <h2>
containing very few restrictions.
</p>
<h3>
Release 3.5.6
Release 3.5.7
</h3>
<h4>
Source Code
</h4>
The source code package contains all of the source code for Scintilla but no binary
executable code and is available in
<ul>
<li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla356.zip?download">zip format</a> (1450K) commonly used on Windows</li>
<li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla356.tgz?download">tgz format</a> (1300K) commonly used on Linux and compatible operating systems</li>
<li><a href="http://www.scintilla.org/scintilla357.zip">zip format</a> (1500K) commonly used on Windows</li>
<li><a href="http://www.scintilla.org/scintilla357.tgz">tgz format</a> (1400K) commonly used on Linux and compatible operating systems</li>
</ul>
Instructions for building on both Windows and Linux are included in the readme file.
<h4>
Expand Down
50 changes: 50 additions & 0 deletions scintilla/doc/ScintillaHistory.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -483,6 +483,56 @@ <h3>
Icons</a> Copyright(C) 1998 by Dean S. Jones<br />
</li>
</ul>
<h3>
<a href="http://prdownloads.sourceforge.net/scintilla/scite356.zip?download">Release 3.5.7</a>
</h3>
<ul>
<li>
Released 20 June 2015.
</li>
<li>
Added SCI_MULTIPLESELECTADDNEXT to add the next occurrence of the main selection within the
target to the set of selections as main. If the current selection is empty then select word around caret.
SCI_MULTIPLESELECTADDEACH adds each occurrence of the main selection within the
target to the set of selections.
</li>
<li>
SciTE adds "Selection Add Next" and "Selection Add Each" commands to the Search menu.
</li>
<li>
Added SCI_ISRANGEWORD to determine if the parameters are at the start and end of a word.
</li>
<li>
Added SCI_TARGETWHOLEDOCUMENT to set the target to the whole document.
</li>
<li>
Verilog lexer recognises protected regions and the folder folds protected regions.
</li>
<li>
A performance problem with markers when deleting many lines was fixed.
<a href="http://sourceforge.net/p/scintilla/bugs/1733/">Bug #1733</a>.
</li>
<li>
On Cocoa fix crash when ScintillaView destroyed if no autocompletion ever displayed.
<a href="http://sourceforge.net/p/scintilla/bugs/1728/">Bug #1728</a>.
</li>
<li>
On Cocoa fix crash in drag and drop.
</li>
<li>
On GTK+ 3.4+, when there are both horizontal and vertical scrollbars, draw the lower-right corner
so that it does not appear black when text selected.
<a href="http://sourceforge.net/p/scintilla/bugs/1611/">Bug #1611</a>.
</li>
<li>
Fixed most calls deprecated in GTK+ 3.16. Does not fix style override calls
as they are more complex.
</li>
<li>
SciTE on GTK+ 3.x uses a different technique for highlighting the search strip when there is
no match which is more compatible with future and past versions and different themes.
</li>
</ul>
<h3>
<a href="http://prdownloads.sourceforge.net/scintilla/scite356.zip?download">Release 3.5.6</a>
</h3>
Expand Down
10 changes: 7 additions & 3 deletions scintilla/doc/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<meta name="keywords" content="Scintilla, SciTE, Editing Component, Text Editor" />
<meta name="Description"
content="www.scintilla.org is the home of the Scintilla editing component and SciTE text editor application." />
<meta name="Date.Modified" content="20150526" />
<meta name="Date.Modified" content="20150620" />
<style type="text/css">
#versionlist {
margin: 0;
Expand Down Expand Up @@ -55,8 +55,8 @@
GTK+, and OS X</font>
</td>
<td width="40%" align="right">
<font color="#FFCC99" size="3"> Release version 3.5.6<br />
Site last modified May 26 2015</font>
<font color="#FFCC99" size="3"> Release version 3.5.7<br />
Site last modified June 20 2015</font>
</td>
<td width="20%">
&nbsp;
Expand All @@ -71,6 +71,8 @@
</tr>
</table>
<ul id="versionlist">
<li>Version 3.5.7 fixes a crash on Cocoa with drag and drop and adds commands to add the next or each occurrence of the
main selection to the set of selections.</li>
<li>Version 3.5.6 fixes a bug with undo on Cocoa that could lose data.</li>
<li>Version 3.5.5 improves IME on Qt and fixes minor bugs.</li>
<li>Version 3.5.4 improves indicators to be able to change appearance on mouse-over and to use a wide variety of colours together.</li>
Expand All @@ -88,12 +90,14 @@
<li id="remote3"><a href="http://www.scintilla.org/SciTE.html">SciTE</a></li>
<li><a href="http://www.scintilla.org/ScintillaHistory.html">History</a></li>
<li><a href="http://www.scintilla.org/ScintillaRelated.html">Related</a></li>
<li id="remote4"><a href="http://www.scintilla.org/Privacy.html">Privacy</a></li>
</ul>
<script type="text/javascript" language="JavaScript"><!--
if (!IsRemote()) { //if NOT remote...
document.getElementById('remote1').style.display='none';
document.getElementById('remote2').style.display='none';
document.getElementById('remote3').style.display='none';
document.getElementById('remote4').style.display='none';
}
//--></script>
<p>
Expand Down
6 changes: 5 additions & 1 deletion scintilla/include/Scintilla.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -434,6 +434,8 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
#define SCI_GETTARGETEND 2193
#define SCI_SETTARGETRANGE 2686
#define SCI_GETTARGETTEXT 2687
#define SCI_TARGETFROMSELECTION 2287
#define SCI_TARGETWHOLEDOCUMENT 2690
#define SCI_REPLACETARGET 2194
#define SCI_REPLACETARGETRE 2195
#define SCI_SEARCHINTARGET 2197
Expand Down Expand Up @@ -498,6 +500,7 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
#define SCI_GETMOUSEDWELLTIME 2265
#define SCI_WORDSTARTPOSITION 2266
#define SCI_WORDENDPOSITION 2267
#define SCI_ISRANGEWORD 2691
#define SC_WRAP_NONE 0
#define SC_WRAP_WORD 1
#define SC_WRAP_CHAR 2
Expand Down Expand Up @@ -559,7 +562,6 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
#define SCI_SETMULTIPASTE 2614
#define SCI_GETMULTIPASTE 2615
#define SCI_GETTAG 2616
#define SCI_TARGETFROMSELECTION 2287
#define SCI_LINESJOIN 2288
#define SCI_LINESSPLIT 2289
#define SCI_SETFOLDMARGINCOLOUR 2290
Expand Down Expand Up @@ -894,6 +896,8 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
#define SCI_GETADDITIONALCARETFORE 2605
#define SCI_ROTATESELECTION 2606
#define SCI_SWAPMAINANCHORCARET 2607
#define SCI_MULTIPLESELECTADDNEXT 2688
#define SCI_MULTIPLESELECTADDEACH 2689
#define SCI_CHANGELEXERSTATE 2617
#define SCI_CONTRACTEDFOLDNEXT 2618
#define SCI_VERTICALCENTRECARET 2619
Expand Down
Loading

0 comments on commit 8104282

Please sign in to comment.