From 9a419cec5779f0677836d530645c3bf490cecff3 Mon Sep 17 00:00:00 2001
From: Don Ho <don.h@free.fr>
Date: Thu, 26 Nov 2015 23:39:55 +0100
Subject: [PATCH] [RELEASE] Notepad++ 6.8.7 release

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

diff --git a/PowerEditor/bin/change.log b/PowerEditor/bin/change.log
index 72971cb82..37a73d3cd 100644
--- a/PowerEditor/bin/change.log
+++ b/PowerEditor/bin/change.log
@@ -1,14 +1,14 @@
-Notepad++ v6.8.6 bug-fixes and enhancements:
+Notepad++ v6.8.7 bug-fixes and enhancements:
 
-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.
+1 .  Fix crash while "backups and session snapshots" is activated. 
+2 .  Restore file extension feature in save dialog.
+3 .  Fix crash issue while moving Find In Files progress window.
+4 .  Fix tab settings not working in javascript.
+5 .  Fix user customized keywords no effect in Javascript.
+6 .  Enhance language detection on "Save as".
+7 .  Add back-quoted string support for javascript.
+8 .  Move position to center when using "-n" option in command line.
+9 .  Installer enhancement: Allow user to keep DSpellCheck plugin.
 
 
 Included plugins:
diff --git a/PowerEditor/installer/nppSetup.nsi b/PowerEditor/installer/nppSetup.nsi
index 494d25016..c51dc1cd9 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.6"
+!define APPVERSION "6.8.7"
 !define APPNAMEANDVERSION "${APPNAME} v${APPVERSION}"
 !define VERSION_MAJOR 6
-!define VERSION_MINOR 86
+!define VERSION_MINOR 87
 
 !define APPWEBSITE "http://notepad-plus-plus.org/"
 
diff --git a/PowerEditor/src/resource.h b/PowerEditor/src/resource.h
index eeecd4307..4f3376c23 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.6")
+#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v6.8.7")
 
 
 // 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.86\0")
-#define VERSION_DIGITALVALUE 6, 8, 6, 0
+#define VERSION_VALUE TEXT("6.87\0")
+#define VERSION_DIGITALVALUE 6, 8, 7, 0
 
 #ifndef IDC_STATIC
 #define IDC_STATIC    -1