From 1356d9e85162729ab99b5ea2dca2d67b250812ac Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Wed, 3 Nov 2021 13:26:02 +1100
Subject: Updates for 5.1.4.

---
 cocoa/Scintilla/Info.plist                          |  2 +-
 cocoa/Scintilla/Scintilla.xcodeproj/project.pbxproj |  8 ++++----
 doc/ScintillaDownload.html                          | 10 +++++-----
 doc/ScintillaHistory.html                           |  2 +-
 doc/index.html                                      | 11 ++++-------
 qt/ScintillaEdit/ScintillaEdit.pro                  |  2 +-
 qt/ScintillaEditBase/ScintillaEditBase.pro          |  2 +-
 version.txt                                         |  2 +-
 win32/ScintRes.rc                                   |  4 ++--
 9 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/cocoa/Scintilla/Info.plist b/cocoa/Scintilla/Info.plist
index 1facbec50..7962ac390 100644
--- a/cocoa/Scintilla/Info.plist
+++ b/cocoa/Scintilla/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>5.1.3</string>
+	<string>5.1.4</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSHumanReadableCopyright</key>
diff --git a/cocoa/Scintilla/Scintilla.xcodeproj/project.pbxproj b/cocoa/Scintilla/Scintilla.xcodeproj/project.pbxproj
index 91ab5e55f..2f9386f64 100644
--- a/cocoa/Scintilla/Scintilla.xcodeproj/project.pbxproj
+++ b/cocoa/Scintilla/Scintilla.xcodeproj/project.pbxproj
@@ -565,7 +565,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 5.1.3;
+				CURRENT_PROJECT_VERSION = 5.1.4;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -627,7 +627,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 5.1.3;
+				CURRENT_PROJECT_VERSION = 5.1.4;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -657,7 +657,7 @@
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 5.1.3;
+				CURRENT_PROJECT_VERSION = 5.1.4;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -691,7 +691,7 @@
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 5.1.3;
+				CURRENT_PROJECT_VERSION = 5.1.4;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
 				DYLIB_COMPATIBILITY_VERSION = 1;
diff --git a/doc/ScintillaDownload.html b/doc/ScintillaDownload.html
index 1670df4e1..a81c515ce 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/scintilla513.zip">
+          <font size="4"> <a href="https://www.scintilla.org/scintilla514.zip">
 	Windows</a>&nbsp;&nbsp;
-	<a href="https://www.scintilla.org/scintilla513.tgz">
+	<a href="https://www.scintilla.org/scintilla514.tgz">
           GTK/Linux</a>&nbsp;&nbsp;
 	</font>
         </td>
@@ -42,7 +42,7 @@
       containing very few restrictions.
     </p>
     <h3>
-       Release 5.1.3
+       Release 5.1.4
     </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/scintilla513.zip">zip format</a> (1.3M) commonly used on Windows</li>
-       <li><a href="https://www.scintilla.org/scintilla513.tgz">tgz format</a> (1.2M) commonly used on Linux and compatible operating systems</li>
+       <li><a href="https://www.scintilla.org/scintilla514.zip">zip format</a> (1.3M) commonly used on Windows</li>
+       <li><a href="https://www.scintilla.org/scintilla514.tgz">tgz format</a> (1.2M) 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 912a3ffeb..7af113dfb 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -572,7 +572,7 @@
     </h3>
     <ul>
 	<li>
-	Released 29 September 2021.
+	Released 7 November 2021.
 	</li>
 	<li>
 	Add DEL to standard set of space characters for word operations.
diff --git a/doc/index.html b/doc/index.html
index fb90c4cfd..b8a8d8b0c 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="20210929" />
+    <meta name="Date.Modified" content="20211107" />
     <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 5.1.3<br />
-           Site last modified September 29 2021</font>
+          <font color="#FFCC99" size="3"> Release version 5.1.4<br />
+           Site last modified November 7 2021</font>
         </td>
         <td width="20%">
           &nbsp;
@@ -72,6 +72,7 @@
       </tr>
     </table>
     <ul id="versionlist">
+      <li>Version 5.1.4 fixes primary selection paste within one instance on GTK.</li>
       <li>Version 5.1.3 fixes a layout bug with monospaced fonts on Cocoa.</li>
       <li>Version 5.1.2 can optimize monospaced fonts and allows hiding the first line.</li>
       <li>Version 5.1.1 searches faster and improves accuracy for invalid DBCS text.</li>
@@ -79,10 +80,6 @@
       platform-independent code and platform layers should remain compatible through 5.x releases.
       The typesafe C++ projection of the API is extended with the ScintillaCall module to include
       methods for calling each API.</li>
-      <li>Version 5.0.3 adds a more typesafe projection of the API for C++ client code.
-      The colours used for selections, carets, and hot spots can now be controlled with the 'elements'
-      APIs which allows better control over translucency and may default to platform colours such
-      as using the system defined selection background colour on macOS.</li>
     </ul>
     <ul id="menu">
       <li id="remote1"><a href="https://www.scintilla.org/SciTEImage.html">Screenshot</a></li>
diff --git a/qt/ScintillaEdit/ScintillaEdit.pro b/qt/ScintillaEdit/ScintillaEdit.pro
index f4cf5407f..c7596415b 100644
--- a/qt/ScintillaEdit/ScintillaEdit.pro
+++ b/qt/ScintillaEdit/ScintillaEdit.pro
@@ -12,7 +12,7 @@ TEMPLATE = lib
 CONFIG += lib_bundle
 CONFIG += c++1z
 
-VERSION = 5.1.3
+VERSION = 5.1.4
 
 SOURCES += \
     ScintillaEdit.cpp \
diff --git a/qt/ScintillaEditBase/ScintillaEditBase.pro b/qt/ScintillaEditBase/ScintillaEditBase.pro
index 23502b675..3bb1608bf 100644
--- a/qt/ScintillaEditBase/ScintillaEditBase.pro
+++ b/qt/ScintillaEditBase/ScintillaEditBase.pro
@@ -12,7 +12,7 @@ TEMPLATE = lib
 CONFIG += lib_bundle
 CONFIG += c++1z
 
-VERSION = 5.1.3
+VERSION = 5.1.4
 
 SOURCES += \
     PlatQt.cpp \
diff --git a/version.txt b/version.txt
index 31cf34b8d..a08796291 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-513
+514
diff --git a/win32/ScintRes.rc b/win32/ScintRes.rc
index 8536edaa0..68c712e5c 100644
--- a/win32/ScintRes.rc
+++ b/win32/ScintRes.rc
@@ -4,8 +4,8 @@
 
 #include <windows.h>
 
-#define VERSION_SCINTILLA "5.1.3"
-#define VERSION_WORDS 5, 1, 3, 0
+#define VERSION_SCINTILLA "5.1.4"
+#define VERSION_WORDS 5, 1, 4, 0
 
 VS_VERSION_INFO VERSIONINFO
 FILEVERSION	VERSION_WORDS
-- 
cgit v1.2.3