From 1725c8f8c1c90406e4be0c20f8a2b6fb91f3b3e9 Mon Sep 17 00:00:00 2001
From: Don Ho <don.h@free.fr>
Date: Mon, 1 Jan 2018 02:58:59 +0100
Subject: [PATCH] Notepad++ release 7.5.4

---
 PowerEditor/bin/change.log | 26 +++++++++-----------------
 PowerEditor/src/resource.h |  6 +++---
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/PowerEditor/bin/change.log b/PowerEditor/bin/change.log
index dc88cfb99..3d207e231 100644
--- a/PowerEditor/bin/change.log
+++ b/PowerEditor/bin/change.log
@@ -1,20 +1,11 @@
-Notepad++ 7.5.3 bug-fixes:
+Notepad++ 7.5.4 enhancements & bug-fixes:
 
-1.  Fix shell extension registration failure in installer.
-2.  Fix theme files installation failure in installer. 
-3.  Fix DSpellCheck incomplete installation in installer.
-
-
-Notepad++ 7.5.2 new features/enhancements & bug-fixes:
-
-1.  Fixed hanging issue while modifying JavaScript TAB settings.
-2.  Add DSpellCheck plugin into distribution.
-3.  Add version and other info into installer.
-4.  Fix an issue while installing a x64 version, x86 version (if it exists) is not removed - and vice versa.
-5.  Fix display glitch of certificate checking error message.
-6.  Remove unused/empty entries from shortcut mapper.
-7.  Add BaanC function list feature.
-8.  Add batch auto-completion into installer.
+1.  Fix a crash bug due to disordered notifications sent to plugins.
+2.  Fix encoding broken regression.
+3.  Improve smart highlighting performance.
+4.  Auto-completion enhancement: remove unwanted symbols {} for variable names.
+5.  Add auto-completion for BaanC & CoffeeScript.
+6.  Fix localization copy regression in Installer.
 
 
 Included plugins:
@@ -22,7 +13,8 @@ Included plugins:
 1.  NppExport v0.2.8 (32-bit x86 only)
 2.  Converter 4.2.1
 3.  Mime Tool 2.1
-4.  DSpellCheck 1.3.2
+4.  DSpellCheck 1.3.5
+
 
 Updater (Installer only):
 
diff --git a/PowerEditor/src/resource.h b/PowerEditor/src/resource.h
index 609f273b2..3702b874b 100644
--- a/PowerEditor/src/resource.h
+++ b/PowerEditor/src/resource.h
@@ -27,12 +27,12 @@
 
 #pragma once
 
-#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v7.5.3")
+#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v7.5.4")
 
 // should be X.Y : ie. if VERSION_DIGITALVALUE == 4, 7, 1, 0 , then X = 4, Y = 71
 // ex : #define VERSION_VALUE TEXT("5.63\0")
-#define VERSION_VALUE TEXT("7.53\0")
-#define VERSION_DIGITALVALUE 7, 5, 3, 0
+#define VERSION_VALUE TEXT("7.54\0")
+#define VERSION_DIGITALVALUE 7, 5, 4, 0