From ba9c223e464369c59674bf6592c4129121d28e1f Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Wed, 21 Apr 2021 07:32:29 +1000
Subject: Updates for 5.0.2.

---
 cocoa/Scintilla/Info.plist                          |  2 +-
 cocoa/Scintilla/Scintilla.xcodeproj/project.pbxproj |  2 +-
 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, 18 insertions(+), 19 deletions(-)

diff --git a/cocoa/Scintilla/Info.plist b/cocoa/Scintilla/Info.plist
index a9219c764..a49e26fa0 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.0.1</string>
+	<string>5.0.2</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 6f5a59ebe..bd194654d 100644
--- a/cocoa/Scintilla/Scintilla.xcodeproj/project.pbxproj
+++ b/cocoa/Scintilla/Scintilla.xcodeproj/project.pbxproj
@@ -545,7 +545,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 5.0.1;
+				CURRENT_PROJECT_VERSION = 5.0.2;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
diff --git a/doc/ScintillaDownload.html b/doc/ScintillaDownload.html
index 1739d3dd2..052d3964c 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/scintilla501.zip">
+          <font size="4"> <a href="https://www.scintilla.org/scintilla502.zip">
 	Windows</a>&nbsp;&nbsp;
-	<a href="https://www.scintilla.org/scintilla501.tgz">
+	<a href="https://www.scintilla.org/scintilla502.tgz">
           GTK/Linux</a>&nbsp;&nbsp;
 	</font>
         </td>
@@ -42,7 +42,7 @@
       containing very few restrictions.
     </p>
     <h3>
-       Release 5.0.1
+       Release 5.0.2
     </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/scintilla501.zip">zip format</a> (1.2M) commonly used on Windows</li>
-       <li><a href="https://www.scintilla.org/scintilla501.tgz">tgz format</a> (1.2M) commonly used on Linux and compatible operating systems</li>
+       <li><a href="https://www.scintilla.org/scintilla502.zip">zip format</a> (1.2M) commonly used on Windows</li>
+       <li><a href="https://www.scintilla.org/scintilla502.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 b01c7f2ae..e98a7c30f 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -576,7 +576,7 @@
     </h3>
     <ul>
 	<li>
-	Released 9 April 2021.
+	Released 23 April 2021.
 	</li>
 	<li>
 	On Cocoa with macOS 11, use plain style for autocompletion to fix problems with truncating text
diff --git a/doc/index.html b/doc/index.html
index 9d1234bf0..7bcc4d843 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="20210409" />
+    <meta name="Date.Modified" content="20210423" />
     <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.0.1<br />
-           Site last modified April 9 2021</font>
+          <font color="#FFCC99" size="3"> Release version 5.0.2<br />
+           Site last modified April 23 2021</font>
         </td>
         <td width="20%">
           &nbsp;
@@ -72,12 +72,11 @@
       </tr>
     </table>
     <ul id="versionlist">
+      <li>Version 5.0.2 fixes text encoding for display and adds font locale support on Windows.
+      Autocompletion lists improved on macOS 11.</li>
       <li>Version 5.0.1 has significantly changed the interface between platform layers and platform-independent code
       with more drawing capabilities. This includes ubiquitous translucency and variable stroke width to better support High DPI displays.</li>
       <li>Version 5.0.0 is an unstable release with lexers unbundled.</li>
-      <li>Version 4.4.6 fixes building with Xcode 12.</li>
-      <li>Version 4.4.5 fixes bugs with indicators, margin text, and ineffective layout caching.</li>
-      <li>Version 4.4.4 implements end of line annotations.</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 121f1d626..ba1d93d10 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.0.1
+VERSION = 5.0.2
 
 SOURCES += \
     ScintillaEdit.cpp \
diff --git a/qt/ScintillaEditBase/ScintillaEditBase.pro b/qt/ScintillaEditBase/ScintillaEditBase.pro
index 34ba969b9..cc0d39c73 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.0.1
+VERSION = 5.0.2
 
 SOURCES += \
     PlatQt.cpp \
diff --git a/version.txt b/version.txt
index c15fb720f..cc5027eed 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-501
+502
diff --git a/win32/ScintRes.rc b/win32/ScintRes.rc
index 44cfb4b34..b01d9024d 100644
--- a/win32/ScintRes.rc
+++ b/win32/ScintRes.rc
@@ -4,8 +4,8 @@
 
 #include <windows.h>
 
-#define VERSION_SCINTILLA "5.0.1"
-#define VERSION_WORDS 5, 0, 1, 0
+#define VERSION_SCINTILLA "5.0.2"
+#define VERSION_WORDS 5, 0, 2, 0
 
 VS_VERSION_INFO VERSIONINFO
 FILEVERSION	VERSION_WORDS
-- 
cgit v1.2.3