diff options
| author | XhmikosR <xhmikosr@users.sourceforge.net> | 2014-02-02 17:45:19 +0200 |
|---|---|---|
| committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2014-02-02 17:45:19 +0200 |
| commit | e63f2e0dcebcc22f24764654b637a4d871b31ae5 (patch) | |
| tree | 471afbb42fb14944ebc72f55007b3cef4c7be4f3 | |
| parent | 83a87f566bc26dbf71f640e574e24fb79362d4bf (diff) | |
| download | notepad2-mod-e63f2e0dcebcc22f24764654b637a4d871b31ae5.zip notepad2-mod-e63f2e0dcebcc22f24764654b637a4d871b31ae5.tar.gz notepad2-mod-e63f2e0dcebcc22f24764654b637a4d871b31ae5.tar.bz2 | |
Update Scintilla to 3.3.9.
| -rw-r--r-- | scintilla/doc/ScintillaDownload.html | 10 | ||||
| -rw-r--r-- | scintilla/doc/ScintillaHistory.html | 12 | ||||
| -rw-r--r-- | scintilla/doc/index.html | 7 | ||||
| -rw-r--r-- | scintilla/src/ExternalLexer.h | 5 | ||||
| -rw-r--r-- | scintilla/version.txt | 2 |
5 files changed, 25 insertions, 11 deletions
diff --git a/scintilla/doc/ScintillaDownload.html b/scintilla/doc/ScintillaDownload.html index b9e9ad2..41da11c 100644 --- a/scintilla/doc/ScintillaDownload.html +++ b/scintilla/doc/ScintillaDownload.html @@ -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/scintilla338.zip?download">
+ <font size="4"> <a href="http://prdownloads.sourceforge.net/scintilla/scintilla339.zip?download">
Windows</a>
- <a href="http://prdownloads.sourceforge.net/scintilla/scintilla338.tgz?download">
+ <a href="http://prdownloads.sourceforge.net/scintilla/scintilla339.tgz?download">
GTK+/Linux</a>
</font>
</td>
@@ -41,7 +41,7 @@ containing very few restrictions.
</p>
<h3>
- Release 3.3.8
+ Release 3.3.9
</h3>
<h4>
Source Code
@@ -49,8 +49,8 @@ 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/scintilla338.zip?download">zip format</a> (1450K) commonly used on Windows</li>
- <li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla338.tgz?download">tgz format</a> (1300K) commonly used on Linux and compatible operating systems</li>
+ <li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla339.zip?download">zip format</a> (1450K) commonly used on Windows</li>
+ <li><a href="http://prdownloads.sourceforge.net/scintilla/scintilla339.tgz?download">tgz format</a> (1300K) 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>
diff --git a/scintilla/doc/ScintillaHistory.html b/scintilla/doc/ScintillaHistory.html index af148cf..4c9c14b 100644 --- a/scintilla/doc/ScintillaHistory.html +++ b/scintilla/doc/ScintillaHistory.html @@ -452,6 +452,18 @@ </li>
</ul>
<h3>
+ <a href="http://prdownloads.sourceforge.net/scintilla/scite339.zip?download">Release 3.3.9</a>
+ </h3>
+ <ul>
+ <li>
+ Released 31 January 2014.
+ </li>
+ <li>
+ Fix 3.3.8 bug where external lexers became inaccessible.
+ <a href="http://sourceforge.net/p/scintilla/bugs/1574/">Bug #1574</a>.
+ </li>
+ </ul>
+ <h3>
<a href="http://prdownloads.sourceforge.net/scintilla/scite338.zip?download">Release 3.3.8</a>
</h3>
<ul>
diff --git a/scintilla/doc/index.html b/scintilla/doc/index.html index c422b0c..d19ec15 100644 --- a/scintilla/doc/index.html +++ b/scintilla/doc/index.html @@ -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="20140128" />
+ <meta name="Date.Modified" content="20140131" />
<style type="text/css">
#versionlist {
margin: 0;
@@ -55,8 +55,8 @@ GTK+, and OS X</font>
</td>
<td width="40%" align="right">
- <font color="#FFCC99" size="3"> Release version 3.3.8<br />
- Site last modified January 28 2014</font>
+ <font color="#FFCC99" size="3"> Release version 3.3.9<br />
+ Site last modified January 31 2014</font>
</td>
<td width="20%">
@@ -71,6 +71,7 @@ </tr>
</table>
<ul id="versionlist">
+ <li>Version 3.3.9 fixes a bug in 3.3.8 that caused external lexers to fail.</li>
<li>Version 3.3.8 improves drawing quality and enhances lexers.</li>
<li>Version 3.3.7 uses responsive scrolling on OS X 10.9, enhances lexers, and fixes bugs.</li>
<li>Version 3.3.6 adds support for the Rust language and fixes bugs.</li>
diff --git a/scintilla/src/ExternalLexer.h b/scintilla/src/ExternalLexer.h index 0b11085..89cf024 100644 --- a/scintilla/src/ExternalLexer.h +++ b/scintilla/src/ExternalLexer.h @@ -27,12 +27,13 @@ typedef LexerFactoryFunction(EXT_LEXER_DECL *GetLexerFactoryFunction)(unsigned i class ExternalLexerModule : public LexerModule {
protected:
GetLexerFactoryFunction fneFactory;
+ std::string name;
public:
ExternalLexerModule(int language_, LexerFunction fnLexer_,
const char *languageName_=0, LexerFunction fnFolder_=0) :
LexerModule(language_, fnLexer_, 0, fnFolder_),
- fneFactory(0) {
- languageName = languageName_;
+ fneFactory(0), name(languageName_){
+ languageName = name.c_str();
}
virtual void SetExternal(GetLexerFactoryFunction fFactory, int index);
};
diff --git a/scintilla/version.txt b/scintilla/version.txt index 8ee4a45..8e20267 100644 --- a/scintilla/version.txt +++ b/scintilla/version.txt @@ -1 +1 @@ -338
+339
|