From 828e14aca12bd2ebde41e84c2163dcf7c46c5908 Mon Sep 17 00:00:00 2001
From: Don Ho <don.h@free.fr>
Date: Sun, 18 Oct 2015 23:00:48 +0200
Subject: [PATCH] [RELEASE] Notepad++ 6.8.5 release

---
 PowerEditor/bin/change.log           | 4 ++++
 PowerEditor/installer/nppSetup.nsi   | 4 ++--
 PowerEditor/installer/packageAll.bat | 1 -
 PowerEditor/src/resource.h           | 6 +++---
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/PowerEditor/bin/change.log b/PowerEditor/bin/change.log
index 1cb73db56..5d818fd7d 100644
--- a/PowerEditor/bin/change.log
+++ b/PowerEditor/bin/change.log
@@ -1,3 +1,7 @@
+Notepad++ v6.8.5 bug-fixes:
+1.  Fix Javascript autocompletion not working regression.
+
+
 Notepad++ v6.8.4 bug-fixes and enhancements:
 
 1.  Improve document switching performance while folding restoring.
diff --git a/PowerEditor/installer/nppSetup.nsi b/PowerEditor/installer/nppSetup.nsi
index 0fffe2d79..03acb5e52 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.4"
+!define APPVERSION "6.8.5"
 !define APPNAMEANDVERSION "${APPNAME} v${APPVERSION}"
 !define VERSION_MAJOR 6
-!define VERSION_MINOR 84
+!define VERSION_MINOR 85
 
 !define APPWEBSITE "http://notepad-plus-plus.org/"
 
diff --git a/PowerEditor/installer/packageAll.bat b/PowerEditor/installer/packageAll.bat
index 8db3eeaae..38738f229 100644
--- a/PowerEditor/installer/packageAll.bat
+++ b/PowerEditor/installer/packageAll.bat
@@ -60,7 +60,6 @@ mkdir .\zipped.package.release\themes
 mkdir .\zipped.package.release\plugins
 mkdir .\zipped.package.release\plugins\APIs
 mkdir .\zipped.package.release\plugins\Config
-mkdir .\zipped.package.release\plugins\Config\Hunspell
 mkdir .\zipped.package.release\plugins\doc
 
 
diff --git a/PowerEditor/src/resource.h b/PowerEditor/src/resource.h
index fb027e5c3..506d7d758 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.4")
+#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v6.8.5")
 
 
 // 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.84\0")
-#define VERSION_DIGITALVALUE 6, 8, 4, 0
+#define VERSION_VALUE TEXT("6.85\0")
+#define VERSION_DIGITALVALUE 6, 8, 5, 0
 
 #ifndef IDC_STATIC
 #define IDC_STATIC    -1