From 018aa335e36259e5028cbc7dfe53c45f293cace0 Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Sat, 2 Mar 2024 19:32:19 +1100
Subject: Updates for version 5.4.2.

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

diff --git a/cocoa/Scintilla/Info.plist b/cocoa/Scintilla/Info.plist
index 8f93ed0dd..c7533ddc3 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.4.1</string>
+	<string>5.4.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 f5ec8e774..c30155539 100644
--- a/cocoa/Scintilla/Scintilla.xcodeproj/project.pbxproj
+++ b/cocoa/Scintilla/Scintilla.xcodeproj/project.pbxproj
@@ -582,7 +582,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 5.4.1;
+				CURRENT_PROJECT_VERSION = 5.4.2;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -647,7 +647,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 5.4.1;
+				CURRENT_PROJECT_VERSION = 5.4.2;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
@@ -680,7 +680,7 @@
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 5.4.1;
+				CURRENT_PROJECT_VERSION = 5.4.2;
 				DEAD_CODE_STRIPPING = YES;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
@@ -715,7 +715,7 @@
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 5.4.1;
+				CURRENT_PROJECT_VERSION = 5.4.2;
 				DEAD_CODE_STRIPPING = YES;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
diff --git a/doc/ScintillaDownload.html b/doc/ScintillaDownload.html
index 918957554..90e264c7c 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/scintilla541.zip">
+          <font size="4"> <a href="https://www.scintilla.org/scintilla542.zip">
 	Windows</a>&nbsp;&nbsp;
-	<a href="https://www.scintilla.org/scintilla541.tgz">
+	<a href="https://www.scintilla.org/scintilla542.tgz">
           GTK/Linux</a>&nbsp;&nbsp;
 	</font>
         </td>
@@ -42,7 +42,7 @@
       containing very few restrictions.
     </p>
     <h3>
-       Release 5.4.1
+       Release 5.4.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/scintilla541.zip">zip format</a> (1.8M) commonly used on Windows</li>
-       <li><a href="https://www.scintilla.org/scintilla541.tgz">tgz format</a> (1.7M) commonly used on Linux and compatible operating systems</li>
+       <li><a href="https://www.scintilla.org/scintilla542.zip">zip format</a> (1.8M) commonly used on Windows</li>
+       <li><a href="https://www.scintilla.org/scintilla542.tgz">tgz format</a> (1.7M) 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 ea9cb4532..49d939332 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -588,7 +588,7 @@
     </h3>
     <ul>
 	<li>
-	Released 27 December 2023.
+	Released 5 March 2024.
 	</li>
 	<li>
 	Significantly reduce memory used for undo actions, often to a half or quarter of previous versions.
diff --git a/doc/index.html b/doc/index.html
index ef2dcfdf4..40eef083c 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="20231227" />
+    <meta name="Date.Modified" content="20240305" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <style type="text/css">
         .logo {
@@ -60,8 +60,8 @@
           GTK, and macOS</font>
         </td>
         <td width="40%" align="right">
-          <font color="#FFCC99" size="3"> Release version 5.4.1<br />
-           Site last modified December 27 2023</font>
+          <font color="#FFCC99" size="3"> Release version 5.4.2<br />
+           Site last modified March 5 2024</font>
         </td>
         <td width="20%">
           &nbsp;
@@ -76,11 +76,11 @@
       </tr>
     </table>
     <ul id="versionlist">
+      <li>Version 5.4.2 can save and restore undo history.</li>
       <li>Version 5.4.1 adds IDocumentEditable interface to allow efficient interaction with document objects.</li>
       <li>Version 5.4.0 fixes crashes on macOS 12 and older when built with Xcode 15.0.</li>
       <li>Version 5.3.8 fixes excesssive memory use when deleting contiguous ranges backwards and is compatible with new macOS 14.</li>
       <li>Version 5.3.7 fixes platform-specific issues on GTK, Qt, and Win32.</li>
-      <li>Version 5.3.6 improves cursor behaviour on Win32 and IME support on Win32 and Qt.</li>
     </ul>
     <ul id="menu">
       <li id="remote1"><a href="https://www.scintilla.org/SciTEImage.html">Screenshot</a></li>
diff --git a/gtk/deps.mak b/gtk/deps.mak
index 323e94aca..8517d3206 100644
--- a/gtk/deps.mak
+++ b/gtk/deps.mak
@@ -9,6 +9,7 @@ PlatGTK.o: \
 	../include/Scintilla.h \
 	../include/Sci_Position.h \
 	../include/ScintillaWidget.h \
+	../src/CharacterType.h \
 	../src/XPM.h \
 	../src/UniConversion.h \
 	Wrappers.h \
diff --git a/qt/ScintillaEdit/ScintillaEdit.pro b/qt/ScintillaEdit/ScintillaEdit.pro
index 8630c63e6..b4f56d32e 100644
--- a/qt/ScintillaEdit/ScintillaEdit.pro
+++ b/qt/ScintillaEdit/ScintillaEdit.pro
@@ -13,7 +13,7 @@ TEMPLATE = lib
 CONFIG += lib_bundle
 CONFIG += c++1z
 
-VERSION = 5.4.1
+VERSION = 5.4.2
 
 SOURCES += \
     ScintillaEdit.cpp \
diff --git a/qt/ScintillaEditBase/ScintillaEditBase.pro b/qt/ScintillaEditBase/ScintillaEditBase.pro
index 5b9f61308..d0f5dfbbc 100644
--- a/qt/ScintillaEditBase/ScintillaEditBase.pro
+++ b/qt/ScintillaEditBase/ScintillaEditBase.pro
@@ -13,7 +13,7 @@ TEMPLATE = lib
 CONFIG += lib_bundle
 CONFIG += c++1z
 
-VERSION = 5.4.1
+VERSION = 5.4.2
 
 SOURCES += \
     PlatQt.cpp \
diff --git a/version.txt b/version.txt
index 9b5dddac7..135b797b4 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-541
+542
diff --git a/win32/ScintRes.rc b/win32/ScintRes.rc
index 9e0e1ab1a..457dcc445 100644
--- a/win32/ScintRes.rc
+++ b/win32/ScintRes.rc
@@ -4,8 +4,8 @@
 
 #include <windows.h>
 
-#define VERSION_SCINTILLA "5.4.1"
-#define VERSION_WORDS 5, 4, 1, 0
+#define VERSION_SCINTILLA "5.4.2"
+#define VERSION_WORDS 5, 4, 2, 0
 
 VS_VERSION_INFO VERSIONINFO
 FILEVERSION	VERSION_WORDS
-- 
cgit v1.2.3