From d82c739f013dde48b7449040e65e841964090569 Mon Sep 17 00:00:00 2001
From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com>
Date: Thu, 29 Sep 2022 19:23:41 +0200
Subject: [PATCH] Release 1.6.4

---
 CHANGELOG.md                              | 19 +++++++++++++++++++
 novelwriter/__init__.py                   |  6 +++---
 novelwriter/assets/text/release_notes.htm |  6 ++++++
 sample/nwProject.nwx                      |  6 +++---
 4 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d305d045..6fa9ffed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,24 @@
 # novelWriter Changelog
 
+## Version 1.6.4 [2022-09-29]
+
+### Release Notes
+
+This is a bugfix release that fixes a critical bug in the insert non-breaking spaces feature. It
+basically no longer worked in the 1.6.3 release. This release also fixes a minor issue where the
+text cursor sometimes dissappears when reaching the right-hand edge of the text editor window.
+
+### Detailed Changelog
+
+**Bugfixes**
+
+* Fixed a bug in the auto-replace feature of the editor that caused a crash when using the insert
+  non-breaking spaces feature was used. Issue #1118. PR #1120.
+* Backported a bugfix from 1.7 RC1 that resolves an issue with the text cursor sometimes
+  dissappearing at the right-hand edge of the text editor. Issues #1112 and #1119. PR #1120.
+
+----
+
 ## Version 1.6.3 [2022-08-18]
 
 ### Release Notes
diff --git a/novelwriter/__init__.py b/novelwriter/__init__.py
index 4428de01..2ee812f4 100644
--- a/novelwriter/__init__.py
+++ b/novelwriter/__init__.py
@@ -60,9 +60,9 @@ __license__    = "GPLv3"
 __author__     = "Veronica Berglyd Olsen"
 __maintainer__ = "Veronica Berglyd Olsen"
 __email__      = "code@vkbo.net"
-__version__    = "1.6.3"
-__hexversion__ = "0x010603f0"
-__date__       = "2022-08-18"
+__version__    = "1.6.4"
+__hexversion__ = "0x010604f0"
+__date__       = "2022-09-29"
 __status__     = "Stable"
 __domain__     = "novelwriter.io"
 __url__        = "https://novelwriter.io"
diff --git a/novelwriter/assets/text/release_notes.htm b/novelwriter/assets/text/release_notes.htm
index a66c4368..a57d329c 100644
--- a/novelwriter/assets/text/release_notes.htm
+++ b/novelwriter/assets/text/release_notes.htm
@@ -64,5 +64,11 @@ the slider splitting the editor and viewer panels can no longer be dragged until
 disappears. It was not necessarily obvious how the viewer panel could be restored in such cases.
 </p>
 
+<h3>Patch 1.6.4 &ndash; 29 September 2022</h3>
+
+<p>This is a bugfix release that fixes a critical bug in the insert non-breaking spaces feature. It
+basically no longer worked in the 1.6.3 release. This release also fixes a minor issue where the
+text cursor sometimes dissappears when reaching the right-hand edge of the text editor window.</p>
+
 </body>
 </html>
diff --git a/sample/nwProject.nwx b/sample/nwProject.nwx
index a10e032e..436f8362 100644
--- a/sample/nwProject.nwx
+++ b/sample/nwProject.nwx
@@ -1,13 +1,13 @@
 <?xml version='1.0' encoding='utf-8'?>
-<novelWriterXML appVersion="1.6.2" hexVersion="0x010602f0" fileVersion="1.3" timeStamp="2022-08-18 20:38:04">
+<novelWriterXML appVersion="1.6.4" hexVersion="0x010604f0" fileVersion="1.3" timeStamp="2022-09-29 19:23:00">
   <project>
     <name>Sample Project</name>
     <title>Sample Project</title>
     <author>Jane Smith</author>
     <author>Jay Doh</author>
-    <saveCount>1304</saveCount>
+    <saveCount>1305</saveCount>
     <autoCount>199</autoCount>
-    <editTime>65055</editTime>
+    <editTime>65071</editTime>
   </project>
   <settings>
     <doBackup>False</doBackup>