Updated for 3.10.0.rel-3-10-0

10 files changed, 41 insertions, 20 deletions

diff --git a/cocoa/ScintillaFramework/Info.plist b/cocoa/ScintillaFramework/Info.plist
index f88e0df48..c59ac9441 100644
--- a/cocoa/ScintillaFramework/Info.plist
+++ b/cocoa/ScintillaFramework/Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.8.0</string>
+	<string>3.10.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>3.8.0</string>
+	<string>3.10.0</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>
diff --git a/doc/ScintillaDownload.html b/doc/ScintillaDownload.html
index 302f8bd70..c363a1fe2 100644
--- a/doc/ScintillaDownload.html
+++ b/doc/ScintillaDownload.html
@@ -26,9 +26,9 @@
     <table bgcolor="#CCCCCC" width="100%" cellspacing="0" cellpadding="8" border="0">
       <tr>
         <td>
-          <font size="4"> <a href="https://www.scintilla.org/scintilla380.zip">
+          <font size="4"> <a href="https://www.scintilla.org/scintilla3100.zip">
 	Windows</a>&nbsp;&nbsp;
-	<a href="https://www.scintilla.org/scintilla380.tgz">
+	<a href="https://www.scintilla.org/scintilla3100.tgz">
           GTK+/Linux</a>&nbsp;&nbsp;
 	</font>
         </td>
@@ -42,7 +42,7 @@
       containing very few restrictions.
     </p>
     <h3>
-       Release 3.8.0
+       Release 3.10.0
     </h3>
     <h4>
        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
        <ul>
-       <li><a href="https://www.scintilla.org/scintilla380.zip">zip format</a> (1600K) commonly used on Windows</li>
-       <li><a href="https://www.scintilla.org/scintilla380.tgz">tgz format</a> (1400K) commonly used on Linux and compatible operating systems</li>
+       <li><a href="https://www.scintilla.org/scintilla3100.zip">zip format</a> (1600K) commonly used on Windows</li>
+       <li><a href="https://www.scintilla.org/scintilla3100.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>
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index e91c51501..28140a649 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -536,11 +536,11 @@
       </li>
     </ul>
 	<h3>
-		 <a href="https://sourceforge.net/projects/scintilla/files/scintilla/3.?/scintilla?.zip/download">Release 3.?</a>
+		<a href="https://sourceforge.net/projects/scintilla/files/scintilla/3.10.0/scintilla3100.zip/download">Release 3.10.0</a>
 	</h3>
 	<ul>
 	<li>
-	Released ?.
+	Released 30 June 2018.
 	</li>
 	<li>
 	Add experimental SC_DOCUMENTOPTION_TEXT_LARGE option to accomodate documents larger than
@@ -572,6 +572,9 @@
 	and ensure something is shown.
 	</li>
 	<li>
+	Curses platform fixed potential crash with newer versions of ncurses.
+	</li>
+	<li>
 	Diff lexer adds styles for diffs containing patches.
 	</li>
 	<li>
@@ -586,6 +589,18 @@
 	<a href="https://sourceforge.net/p/scintilla/feature-requests/1216/">Feature #1216.</a>
 	</li>
 	<li>
+	Markdown Lua LPeg lexer fixes incorrect highlighting of markdown lists.
+	</li>
+	<li>
+	Fixed child Lua LPeg lexers that embed themselves into parents. Also fixed proxy lexers.
+	</li>
+	<li>
+	Fixed legacy Lua LPeg lexers with custom fold functions.
+	</li>
+	<li>
+	C# Lua LPeg lexer highlights "var" keyword.
+	</li>
+	<li>
 	Set the last X chosen when SCI_REPLACESEL called to ensure macros work
 	when text insertion followed by caret up or down.
 	</li>
diff --git a/doc/index.html b/doc/index.html
index f46100194..1c86f9a01 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -56,7 +56,7 @@
           GTK+, and OS X</font>
         </td>
         <td width="40%" align="right">
-          <font color="#FFCC99" size="3"> Release version 3.8.0<br />
+          <font color="#FFCC99" size="3"> Release version 3.10.0<br />
            Site last modified February 12 2018</font>
         </td>
         <td width="20%">
diff --git a/qt/ScintillaEdit/ScintillaEdit.pro b/qt/ScintillaEdit/ScintillaEdit.pro
index dc09f2738..f9401b0c8 100644
--- a/qt/ScintillaEdit/ScintillaEdit.pro
+++ b/qt/ScintillaEdit/ScintillaEdit.pro
@@ -20,7 +20,7 @@ unix {
     }
 }
 
-VERSION = 3.8.0
+VERSION = 3.10.0
 
 SOURCES += \
     ScintillaEdit.cpp \
diff --git a/qt/ScintillaEditBase/ScintillaEditBase.pro b/qt/ScintillaEditBase/ScintillaEditBase.pro
index 00d972577..683bce111 100644
--- a/qt/ScintillaEditBase/ScintillaEditBase.pro
+++ b/qt/ScintillaEditBase/ScintillaEditBase.pro
@@ -19,7 +19,7 @@ unix {
     }
 }
 
-VERSION = 3.8.0
+VERSION = 3.10.0
 
 SOURCES += \
     PlatQt.cpp \
diff --git a/scripts/LexGen.py b/scripts/LexGen.py
index ae7ae99d5..261cb7ee1 100644
--- a/scripts/LexGen.py
+++ b/scripts/LexGen.py
@@ -29,7 +29,7 @@ def UpdateVersionNumbers(sci, root):
     UpdateLineInFile(root + "doc/ScintillaDownload.html", "       Release",
         "       Release " + sci.versionDotted)
     ReplaceREInFile(root + "doc/ScintillaDownload.html",
-        r"/www.scintilla.org/([a-zA-Z]+)\d\d\d",
+        r"/www.scintilla.org/([a-zA-Z]+)\d\d\d\d?",
         r"/www.scintilla.org/\g<1>" +  sci.version)
     UpdateLineInFile(root + "doc/index.html",
         '          <font color="#FFCC99" size="3"> Release version',
diff --git a/scripts/ScintillaData.py b/scripts/ScintillaData.py
index 0ac1eddfa..385db59af 100644
--- a/scripts/ScintillaData.py
+++ b/scripts/ScintillaData.py
@@ -195,10 +195,16 @@ class ScintillaData:
         # Discover verion information
         with open(scintillaRoot + "version.txt") as f:
             self.version = f.read().strip()
-        self.versionDotted = self.version[0] + '.' + self.version[1] + '.' + \
-            self.version[2]
-        self.versionCommad = self.version[0] + ', ' + self.version[1] + ', ' + \
-            self.version[2] + ', 0'
+        if len(self.version) == 3:
+            self.versionDotted = self.version[0] + '.' + self.version[1] + '.' + \
+                self.version[2]
+            self.versionCommad = self.version[0] + ', ' + self.version[1] + ', ' + \
+                self.version[2] + ', 0'
+        else:
+            self.versionDotted = self.version[0] + '.' + self.version[1:3] + '.' + \
+                self.version[3]
+            self.versionCommad = self.version[0] + ', ' + self.version[1:3] + ', ' + \
+                self.version[3] + ', 0'
 
         with open(scintillaRoot + "doc/index.html") as f:
             self.dateModified = [l for l in f.readlines() if "Date.Modified" in l]\
diff --git a/version.txt b/version.txt
index c2f531175..d9d811cb3 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-380
+3100
diff --git a/win32/ScintRes.rc b/win32/ScintRes.rc
index f25971bfc..742cccdba 100644
--- a/win32/ScintRes.rc
+++ b/win32/ScintRes.rc
@@ -4,8 +4,8 @@
 
 #include <windows.h>
 
-#define VERSION_SCINTILLA "3.8.0"
-#define VERSION_WORDS 3, 8, 0, 0
+#define VERSION_SCINTILLA "3.10.0"
+#define VERSION_WORDS 3, 10, 0, 0
 
 VS_VERSION_INFO VERSIONINFO
 FILEVERSION	VERSION_WORDS