update scintilla

git-svn-id: https://notepad2-mod.googlecode.com/svn/trunk@586 28bd50df-7adb-d945-0439-6e466c6a13cc

3 files changed, 5 insertions, 1 deletions

diff --git a/Readme-mod.txt b/Readme-mod.txt
index 2f10143..380fcd4 100644
--- a/Readme-mod.txt
+++ b/Readme-mod.txt
@@ -24,4 +24,4 @@ More information:
 

 Notepad2-mod 4.2.25 has been created with Scintilla 2.29.  The unused lexers

 are commented out in "scintilla/src/Catalogue.cxx".  You can use WDK 7.1,

-MSVC 2010, or Intel Parallel Composer 2011 to build Notepad2-mod.

+MSVC 2010 or Intel Parallel Composer 2011 Update 5 to build Notepad2-mod.

diff --git a/scintilla/doc/ScintillaHistory.html b/scintilla/doc/ScintillaHistory.html
index 25f792e..974038b 100644
--- a/scintilla/doc/ScintillaHistory.html
+++ b/scintilla/doc/ScintillaHistory.html
@@ -385,6 +385,8 @@
 	<td>Ben Bluemel</td>

 	<td>David Wolfendale</td>

 	<td>Chris Angelico</td>

+      </tr><tr>

+	<td>Marat Dukhan</td>

     </tr>

     </table>

     <p>

diff --git a/scintilla/src/PerLine.cxx b/scintilla/src/PerLine.cxx
index 795f628..6717b17 100644
--- a/scintilla/src/PerLine.cxx
+++ b/scintilla/src/PerLine.cxx
@@ -183,6 +183,8 @@ int LineMarkers::MarkValue(int line) {
 }

 

 int LineMarkers::MarkerNext(int lineStart, int mask) const {

+	if (lineStart < 0)

+		lineStart = 0;

 	int length = markers.Length();

 	for (int iLine = lineStart; iLine < length; iLine++) {

 		MarkerHandleSet *onLine = markers[iLine];