From e339c0f600295267db7a8df01598d1cdb8f1c5cc Mon Sep 17 00:00:00 2001
From: Don Ho <don.h@free.fr>
Date: Mon, 27 Nov 2017 09:32:44 +0100
Subject: [PATCH] Notepad++ 7.5.2 release

---
 PowerEditor/bin/change.log                    | 26 ++++++++-----------
 .../nsisInclude/mainSectionFuncs.nsh          |  3 ++-
 PowerEditor/src/NppCommands.cpp               |  4 +--
 PowerEditor/src/resource.h                    |  6 ++---
 4 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/PowerEditor/bin/change.log b/PowerEditor/bin/change.log
index 2e29e31c5..2f5a17e44 100644
--- a/PowerEditor/bin/change.log
+++ b/PowerEditor/bin/change.log
@@ -1,17 +1,13 @@
-Notepad++ 7.5.1 new featurs/enhancements & bug-fixes:
-
-1.  Fix some excluded language cannot be remembered bug.
-2.  Fix a localization regression bug.
-3.  Fix the bug that Notepad++ create "%APPDATA%\local\notepad++" folder in local conf mode.
-4.  Add Visual Prolog language support.
-5.  Add auto-completion support for batch file (*.bat).
-6.  Enhance Function List for PHP and JavaScript.
-7.  Enhance Shortcut Mapper by adding category column.
-8.  Make double click work for language menu disabling/enabling in preferences dialog.
-9.  Make double click work to improve file extension movement in Preferences dialog.
-10. Fix bug: language menu item is restored back on the wrong zone.
-11. Add a spiritual quote.
+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.
 
 
 Included plugins:
@@ -19,8 +15,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
 
 Updater (Installer only):
 
-* WinGup v4.1
+* WinGup v4.2
diff --git a/PowerEditor/installer/nsisInclude/mainSectionFuncs.nsh b/PowerEditor/installer/nsisInclude/mainSectionFuncs.nsh
index 1e83860be..f0c17e735 100644
--- a/PowerEditor/installer/nsisInclude/mainSectionFuncs.nsh
+++ b/PowerEditor/installer/nsisInclude/mainSectionFuncs.nsh
@@ -201,7 +201,7 @@ Function removeUnstablePlugins
 		MessageBox MB_OK "Due to the stability issue,$\nNppQCP.dll will be moved to the directory $\"disabled$\"" /SD IDOK
 		Rename "$INSTDIR\plugins\NppQCP.dll" "$INSTDIR\plugins\disabled\NppQCP.dll"
 		Delete "$INSTDIR\plugins\NppQCP.dll"
-		
+	/*
 	IfFileExists "$INSTDIR\plugins\DSpellCheck.dll" 0 +11
 		MessageBox MB_YESNOCANCEL "Due to the stability issue, DSpellCheck.dll will be moved to the directory $\"disabled$\".$\nChoose Cancel to keep it for this installation.$\nChoose No to keep it forever." /SD IDYES IDNO never IDCANCEL donothing ;IDYES remove
 		Rename "$INSTDIR\plugins\DSpellCheck.dll" "$INSTDIR\plugins\disabled\DSpellCheck.dll"
@@ -210,6 +210,7 @@ Function removeUnstablePlugins
 	never:
 		Rename "$INSTDIR\plugins\DSpellCheck.dll" "$INSTDIR\plugins\DSpellCheck2.dll"
 		Goto donothing
+	*/
 	donothing:
 FunctionEnd
 
diff --git a/PowerEditor/src/NppCommands.cpp b/PowerEditor/src/NppCommands.cpp
index c8e43227a..d1e69db75 100644
--- a/PowerEditor/src/NppCommands.cpp
+++ b/PowerEditor/src/NppCommands.cpp
@@ -71,7 +71,7 @@ void Notepad_plus::command(int id)
 		{
 			fileNew();
 
-			///*
+			/*
 			bool isFirstTime = ! _pluginsAdminDlg.isCreated();
 			_pluginsAdminDlg.setPluginsManager(&_pluginsManager);
 			_pluginsAdminDlg.doDialog(_nativeLangSpeaker.isRTL());
@@ -80,7 +80,7 @@ void Notepad_plus::command(int id)
 				_nativeLangSpeaker.changeConfigLang(_pluginsAdminDlg.getHSelf());
 				_pluginsAdminDlg.updateListAndLoadFromJson();
 			}
-			//*/
+			*/
 		}
 		break;
 
diff --git a/PowerEditor/src/resource.h b/PowerEditor/src/resource.h
index 97c94c15a..1ab0880d0 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.1")
+#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v7.5.2")
 
 // 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.51\0")
-#define VERSION_DIGITALVALUE 7, 5, 1, 0
+#define VERSION_VALUE TEXT("7.52\0")
+#define VERSION_DIGITALVALUE 7, 5, 2, 0