From 3733d971464e5914ded6931c9abd777e81fe9b9b Mon Sep 17 00:00:00 2001
From: Don Ho <don.h@free.fr>
Date: Thu, 29 Oct 2015 02:15:49 +0100
Subject: [PATCH] [RELEASE] Notepad++ 6.8.6 release

---
 PowerEditor/bin/change.log         | 29 ++++++++++-------------------
 PowerEditor/installer/nppSetup.nsi |  4 ++--
 PowerEditor/src/resource.h         |  6 +++---
 3 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/PowerEditor/bin/change.log b/PowerEditor/bin/change.log
index 5d818fd7d..72971cb82 100644
--- a/PowerEditor/bin/change.log
+++ b/PowerEditor/bin/change.log
@@ -1,23 +1,14 @@
-Notepad++ v6.8.5 bug-fixes:
-1.  Fix Javascript autocompletion not working regression.
+Notepad++ v6.8.6 bug-fixes and enhancements:
 
-
-Notepad++ v6.8.4 bug-fixes and enhancements:
-
-1.  Improve document switching performance while folding restoring.
-2.  Enhance Javascript syntax highlighting: 2 groups of keywords more for syntax highlighting customization.
-3.  Improve auto-insert usability: the open symbols (", ', (, [ and { ) triggers the close symbols according to the context.
-4.  Apply new added language auto-detection (for php, xml, html and bash) in the case of unknown file extension.
-4.  Add JSON language support.
-5.  Fix macro playback inserting/removing characters randomly.
-6.  Fix Save All button is still enabled problem while no file to save.
-7.  Make file save dialog modern style.
-8.  Fix auto-insert for xml comment incorrect insertion.
-9.  Fix user command save problem on exit.
-10. Fix macro save problem on exit.
-11. Fix the restoring from system tray problem while running in admin mode.
-12. Fix smart highlighting not working in some case.
-13. Enlarge tabbar height.
+1.  Fix function list not working for Javascript regression.
+2.  Fix maintain indent not working in javascript regression.
+3.  Improve the language detection at the beginning of file content.
+4.  Fix possible file corruption during macro playback.
+5.  Fix wrong EOL mode for opening/reloading big files.
+6.  Fix loading 3 bytes file error due to bad encoding detection (UTF16 w/o BOM).
+7.  Fix DocMap not updating issue when switching to user defined language or external lexer.
+8.  Fix reload file issue: document marked as unsaved after reloading.
+9.  Enhance the detection of EOL: if a document has no EOL for detecting, use EOL of new document settings.
 
 
 Included plugins:
diff --git a/PowerEditor/installer/nppSetup.nsi b/PowerEditor/installer/nppSetup.nsi
index 03acb5e52..dcb22c8eb 100644
--- a/PowerEditor/installer/nppSetup.nsi
+++ b/PowerEditor/installer/nppSetup.nsi
@@ -36,10 +36,10 @@
 ; Define the application name
 !define APPNAME "Notepad++"
 
-!define APPVERSION "6.8.5"
+!define APPVERSION "6.8.6"
 !define APPNAMEANDVERSION "${APPNAME} v${APPVERSION}"
 !define VERSION_MAJOR 6
-!define VERSION_MINOR 85
+!define VERSION_MINOR 86
 
 !define APPWEBSITE "http://notepad-plus-plus.org/"
 
diff --git a/PowerEditor/src/resource.h b/PowerEditor/src/resource.h
index 506d7d758..eeecd4307 100644
--- a/PowerEditor/src/resource.h
+++ b/PowerEditor/src/resource.h
@@ -26,13 +26,13 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #pragma once
 
-#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v6.8.5")
+#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v6.8.6")
 
 
 // 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("6.85\0")
-#define VERSION_DIGITALVALUE 6, 8, 5, 0
+#define VERSION_VALUE TEXT("6.86\0")
+#define VERSION_DIGITALVALUE 6, 8, 6, 0
 
 #ifndef IDC_STATIC
 #define IDC_STATIC    -1