From 2d7ae96a64d4c47466ea0863a47433e29a63fab6 Mon Sep 17 00:00:00 2001
From: Don Ho <don.h@free.fr>
Date: Thu, 10 Dec 2015 01:07:07 +0100
Subject: [PATCH] [RELEASE] Notepad++ 6.8.8 release

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

diff --git a/PowerEditor/bin/change.log b/PowerEditor/bin/change.log
index 37a73d3cd..afb906966 100644
--- a/PowerEditor/bin/change.log
+++ b/PowerEditor/bin/change.log
@@ -1,14 +1,13 @@
-Notepad++ v6.8.7 bug-fixes and enhancements:
+Notepad++ v6.8.8 bug-fixes and enhancements:
 
-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.
+1.  Fix a regression of link style in html/php.
+2.  Fix find in files progress window alway on top issue.
+3.  Add Debug Info helper feature.
+4.  Fix highlighting for tags inside comment problem.
+5.  Make editor border edge display optional.
+6.  Enhance syntax highlighting for D, Powershell, Lua and Python.
+7.  Enhance syntax highlighting of preprocessor comments for several languages.
+8.  Improve close button in tab position.
 
 
 Included plugins:
diff --git a/PowerEditor/installer/nppSetup.nsi b/PowerEditor/installer/nppSetup.nsi
index 0c684d3b7..fda55edbf 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.7"
+!define APPVERSION "6.8.8"
 !define APPNAMEANDVERSION "${APPNAME} v${APPVERSION}"
 !define VERSION_MAJOR 6
-!define VERSION_MINOR 87
+!define VERSION_MINOR 88
 
 !define APPWEBSITE "http://notepad-plus-plus.org/"
 
diff --git a/PowerEditor/src/resource.h b/PowerEditor/src/resource.h
index a0270e1a0..8d9a0f5c7 100644
--- a/PowerEditor/src/resource.h
+++ b/PowerEditor/src/resource.h
@@ -26,13 +26,15 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #pragma once
 
-#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v6.8.7")
 
+#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v6.8.8")
 
 // 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.87\0")
-#define VERSION_DIGITALVALUE 6, 8, 7, 0
+#define VERSION_VALUE TEXT("6.88\0")
+#define VERSION_DIGITALVALUE 6, 8, 8, 0
+
+
 
 #ifndef IDC_STATIC
 #define IDC_STATIC    -1