From 388c430e215f6099923906aa9fa79c5aa820b347 Mon Sep 17 00:00:00 2001
From: Don Ho <don.h@free.fr>
Date: Wed, 8 Mar 2017 04:04:59 +0100
Subject: [PATCH] Notepad++ v7.3.3 release

In this release:
Fix CIA Hacking Notepad++ issue
(https://wikileaks.org/ciav7p1/cms/page_26968090.html).
and more...
---
 PowerEditor/bin/change.log                    | 24 +++++++++----------
 .../installer/nsisInclude/globalDef.nsh       |  4 ++--
 PowerEditor/src/resource.h                    |  6 ++---
 3 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/PowerEditor/bin/change.log b/PowerEditor/bin/change.log
index 830e009ea..494b514c0 100644
--- a/PowerEditor/bin/change.log
+++ b/PowerEditor/bin/change.log
@@ -1,17 +1,15 @@
-Notepad++ 7.3.2 bug-fixs & enhancements:
+Notepad++ 7.3.3 bug-fixs & enhancements:
 
-1.  Fix crash issue on column mode editor.
-2.  Fix "Use new style save dialog" setting's regression.
-3.  Enhance "Open file" command - open a file from editor zone without selecting its full path.
-4.  Fix word char list settings not applying on next launch issue.
-5.  Fix block uncomment for line comment bug.
-6.  BaanC Language is surpported.
-7.  Add error notification on run dialog.
-8.  Fix the caret position not maintained issue between document move.
-9.  Fix caret goes to wrong position after word completion.
-10. Enhance Function List for supporting language.
-11. Add check mark in Language menu.
-12. Fix toolbar not showing issue while launching Notepad++ from system tray in some unknown configuration.
+1.  Fix CIA Hacking Notepad++ issue (https://wikileaks.org/ciav7p1/cms/page_26968090.html).
+2.  Fix mouse wheel to task list scroll crash bug.
+3.  Fix flickering issue while switching back after modifying or deleting a document from outside.
+4.  Support Motorola S-Record, Intel and Tektronix extended hex file formats.
+5.  Improve multi-line tab: maintaining the selected tab position.
+6.  Fix add char into word char list bug.
+7.  Add Shift+Enter in Find dialog for searching in the opposite direction.
+8.  Fix a regression that delimiter settings is not retained correctely.
+9.  Add clear command button in shortcut mapper.
+10. Enhancement: file extension supported in Load/Save Session dialog if a session file extension is set.
 
 
 Included plugins:
diff --git a/PowerEditor/installer/nsisInclude/globalDef.nsh b/PowerEditor/installer/nsisInclude/globalDef.nsh
index 6b8785c2f..944d88498 100644
--- a/PowerEditor/installer/nsisInclude/globalDef.nsh
+++ b/PowerEditor/installer/nsisInclude/globalDef.nsh
@@ -29,10 +29,10 @@
 ; Define the application name
 !define APPNAME "Notepad++"
 
-!define APPVERSION "7.3.2"
+!define APPVERSION "7.3.3"
 !define APPNAMEANDVERSION "${APPNAME} v${APPVERSION}"
 !define VERSION_MAJOR 7
-!define VERSION_MINOR 32
+!define VERSION_MINOR 33
 
 !define APPWEBSITE "http://notepad-plus-plus.org/"
 
diff --git a/PowerEditor/src/resource.h b/PowerEditor/src/resource.h
index dd73f01d7..b5a28d962 100644
--- a/PowerEditor/src/resource.h
+++ b/PowerEditor/src/resource.h
@@ -27,12 +27,12 @@
 
 #pragma once
 
-#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v7.3.2")
+#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v7.3.3")
 
 // 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.32\0")
-#define VERSION_DIGITALVALUE 7, 3, 2, 0
+#define VERSION_VALUE TEXT("7.33\0")
+#define VERSION_DIGITALVALUE 7, 3, 3, 0