Make a new release due to a regression in SciTE with 4.1.6.rel-4-1-7

8 files changed, 27 insertions, 15 deletions

diff --git a/cocoa/ScintillaFramework/Info.plist b/cocoa/ScintillaFramework/Info.plist
index 7512a81a5..fb32e6488 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>4.1.6</string>
+	<string>4.1.7</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>4.1.6</string>
+	<string>4.1.7</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>
diff --git a/doc/ScintillaDownload.html b/doc/ScintillaDownload.html
index a0144bbdb..0e573b540 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/scintilla416.zip">
+          <font size="4"> <a href="https://www.scintilla.org/scintilla417.zip">
 	Windows</a>&nbsp;&nbsp;
-	<a href="https://www.scintilla.org/scintilla416.tgz">
+	<a href="https://www.scintilla.org/scintilla417.tgz">
           GTK/Linux</a>&nbsp;&nbsp;
 	</font>
         </td>
@@ -42,7 +42,7 @@
       containing very few restrictions.
     </p>
     <h3>
-       Release 4.1.6
+       Release 4.1.7
     </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/scintilla416.zip">zip format</a> (1700K) commonly used on Windows</li>
-       <li><a href="https://www.scintilla.org/scintilla416.tgz">tgz format</a> (1500K) commonly used on Linux and compatible operating systems</li>
+       <li><a href="https://www.scintilla.org/scintilla417.zip">zip format</a> (1700K) commonly used on Windows</li>
+       <li><a href="https://www.scintilla.org/scintilla417.tgz">tgz format</a> (1500K) 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 b938300f4..3bc9d0698 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -554,6 +554,17 @@
       </li>
     </ul>
     <h3>
+       <a href="https://www.scintilla.org/scite417.zip">Release 4.1.7</a>
+    </h3>
+    <ul>
+	<li>
+	Released 13 June 2019.
+	</li>
+	<li>
+	Fixes an incorrect default setting in SciTE which caused multiple visual features to fail to display.
+	</li>
+    </ul>
+    <h3>
        <a href="https://www.scintilla.org/scite416.zip">Release 4.1.6</a>
     </h3>
     <ul>
diff --git a/doc/index.html b/doc/index.html
index a43a40bef..4f7946cb3 100644
--- a/doc/index.html
+++ b/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="20190610" />
+    <meta name="Date.Modified" content="20190613" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <style type="text/css">
         #versionlist {
@@ -56,8 +56,8 @@
           GTK, and OS X</font>
         </td>
         <td width="40%" align="right">
-          <font color="#FFCC99" size="3"> Release version 4.1.6<br />
-           Site last modified June 10 2019</font>
+          <font color="#FFCC99" size="3"> Release version 4.1.7<br />
+           Site last modified June 13 2019</font>
         </td>
         <td width="20%">
           &nbsp;
@@ -72,6 +72,7 @@
       </tr>
     </table>
     <ul id="versionlist">
+      <li>Version 4.1.7 is just to match a bug-fix release of SciTE and changes nothing in Scintilla.</li>
       <li>Version 4.1.6 adds an X12 lexer and improves performance on huge files.</li>
       <li>Version 4.1.5 removes special handling of non-0 wParam to WM_PAINT on Win32 and changes
       clipboard operations on GTK to avoid flickering.</li>
diff --git a/qt/ScintillaEdit/ScintillaEdit.pro b/qt/ScintillaEdit/ScintillaEdit.pro
index 3634e82a1..dea8ce540 100644
--- a/qt/ScintillaEdit/ScintillaEdit.pro
+++ b/qt/ScintillaEdit/ScintillaEdit.pro
@@ -12,7 +12,7 @@ TEMPLATE = lib
 CONFIG += lib_bundle
 CONFIG += c++1z
 
-VERSION = 4.1.6
+VERSION = 4.1.7
 
 SOURCES += \
     ScintillaEdit.cpp \
diff --git a/qt/ScintillaEditBase/ScintillaEditBase.pro b/qt/ScintillaEditBase/ScintillaEditBase.pro
index 1bb69a6df..0eb6588a3 100644
--- a/qt/ScintillaEditBase/ScintillaEditBase.pro
+++ b/qt/ScintillaEditBase/ScintillaEditBase.pro
@@ -12,7 +12,7 @@ TEMPLATE = lib
 CONFIG += lib_bundle
 CONFIG += c++1z
 
-VERSION = 4.1.6
+VERSION = 4.1.7
 
 SOURCES += \
     PlatQt.cpp \
diff --git a/version.txt b/version.txt
index 1c105f1a6..53c86ff4f 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-416
+417
diff --git a/win32/ScintRes.rc b/win32/ScintRes.rc
index 569571f1b..62e38a5f4 100644
--- a/win32/ScintRes.rc
+++ b/win32/ScintRes.rc
@@ -4,8 +4,8 @@
 
 #include <windows.h>
 
-#define VERSION_SCINTILLA "4.1.6"
-#define VERSION_WORDS 4, 1, 6, 0
+#define VERSION_SCINTILLA "4.1.7"
+#define VERSION_WORDS 4, 1, 7, 0
 
 VS_VERSION_INFO VERSIONINFO
 FILEVERSION	VERSION_WORDS