From 5c272a88184748435acce70bceca5ae33f989731 Mon Sep 17 00:00:00 2001
From: Don Ho <don.h@free.fr>
Date: Sat, 16 May 2015 02:36:09 +0200
Subject: [PATCH] [RELEASE] Notepad++ 6.7.8 release.

---
 .gitignore                         |  1 +
 PowerEditor/bin/change.log         | 20 +++++++-------
 PowerEditor/bin/updater/gup.xml    | 43 +++++++++++++++++-------------
 PowerEditor/installer/nppSetup.nsi | 16 ++++++++---
 PowerEditor/src/resource.h         |  6 ++---
 5 files changed, 51 insertions(+), 35 deletions(-)

diff --git a/.gitignore b/.gitignore
index a4680167..5fba0089 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@ x64/
 x86/
 #[Bb]in/
 [Oo]bj/
+*.pdb
 
 #-- Visual C++ cache files
 ipch/
diff --git a/PowerEditor/bin/change.log b/PowerEditor/bin/change.log
index c7a0b187..72d8e8e3 100644
--- a/PowerEditor/bin/change.log
+++ b/PowerEditor/bin/change.log
@@ -1,18 +1,20 @@
-Notepad++ v6.7.7 bug-fix:
+Notepad++ v6.7.8 new features and bug-fixes:
 
-1.  Fix "Restore last closed file" (Ctrl+Shift+T) display bug.
+1.  Fix an annoying regression about message "The buffer passed to GetFullPathName was too small!".
+2.  Update WinGup to version 3.0 which has SSL support and customizable User-Agent.
+3.  Improve sort lines performance greatly.
+4.  Fix tabbar close button usability issue (too small) on a high resolution laptop (Surface Pro 3).
+5.  Fix Settings on cloud - Google drive detection error.
+6.  Hiding tab bar via command line won't make hidden tab setting be saved in the next session.
+7.  Fix a bug of "Jump to next indicator" command.
+8.  Fix "File Status auto-detection" settings bug.
 
 
-Notepad++ v6.7.6 new feature and bug-fixes:
-
-1.  Add "Restore last closed file" (Ctrl+Shift+T) feature.
-2.  Fix Setting on Cloud for dropbox and for google drive not working issue. 
-
 
 Included plugins:
 
-1.  DSpellCheck v1.2.12
-2.  NppFTP 0.26.1
+1.  DSpellCheck v1.2.14
+2.  NppFTP 0.26.3
 3.  NppExport v0.2.8
 4.  Plugin Manager 1.3.5
 5.  Converter 3.0
diff --git a/PowerEditor/bin/updater/gup.xml b/PowerEditor/bin/updater/gup.xml
index 97277f9b..6f43a7c1 100644
--- a/PowerEditor/bin/updater/gup.xml
+++ b/PowerEditor/bin/updater/gup.xml
@@ -2,14 +2,14 @@
 <!--
     Copyright 2007 Don HO <don.h@free.fr>
 	
-    This file is part of GUP.
+    This file is part of WinGup.
 
-    GUP is free software: you can redistribute it and/or modify
+    WinGup is free software: you can redistribute it and/or modify
     it under the terms of the GNU Lesser General Public License as published by
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
-    GUP is distributed in the hope that it will be useful,
+    WinGup is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU Lesser General Public License for more details.
@@ -19,39 +19,44 @@
 -->
 <GUPInput>
 	<!-- optional.
-	It's the current version of your program. GUP will add "?version=versionNumber" at the end of InfoUrl.
-	This parameter will be ignored if you pass directly your version number to GUP 
+	It's the current version of your program. WinGup will add "?version=versionNumber" at the end of InfoUrl.
+	This parameter will be ignored if you pass directly your version number to WinGup via command line.
 	-->
 	<Version>4.6</Version>
 
 	<!-- Mandatory.
-	This is the url (your web application) from where your GUP gets the update information.
+	This is the url (your web application, both http and https are supported) from where your WinGup gets the update information.
 	The tag "Version" value will be the parameter that your web application can use $_GET["version"] to get the current version of the program to be updated.
-	With the current version value, your web application should return a set of information in xml form to tell GUP update version and the location of update package to download.
+	With the current version value, your web application should return a set of information in xml form to tell WinGup update version and the location of update package to download.
 	-->
 	<!--InfoUrl>http://notepad-plus.sourceforge.net/commun/update/getDownLoadUrl.php</InfoUrl-->
-	<InfoUrl>http://notepad-plus-plus.org/update/getDownloadUrl.php</InfoUrl>
+	<InfoUrl>https://notepad-plus-plus.org/update/getDownloadUrl.php</InfoUrl>
 
-	<!-- optional. 
-	The User-Agent you want to use to download your binary.
-	If this node is absent or empty, then "Generic Updater for Win32" will be used by default.
+	<!-- Optional. 
+	The SoftwareName(plus its version) will be part of the User-Agent you want to use to download your binary:
+	Notepad++/4.6 (WinGup/3.0)
+	If this node is absent or empty, then only "WinGup/WINGUP_VERSION" will be used as User-Agent:
+	WinGup/3.0
 	-->
-	<User-agent>Notepad++ Generic Updater</User-agent>
+	<SoftwareName>Notepad++</SoftwareName>
 
-	<!-- optional. 
+	<!-- Optional. 
 	The window class name of program that you want to update.
-	GUP uses FindWindow routine to get the Handle of window, then send WM_CLOSE to the handle in order to quit the program.
-	If there are several running instances, GUP will kill one by one until the last instance.
+	WinGup uses FindWindow routine to get the Handle of window, then send WM_CLOSE to the handle in order to quit the program.
+	If there are several running instances, WinGup will kill one by one until the last instance.
 	
 	In win32 system, if a program is running, the binary file is locked. 
-	Use this parameter to close the program to make sure the old binary files can be erased by new ones.
+	Use this parameter to close the program to make sure the old binary files can be erased by new one.
 	-->
 	<ClassName2Close>Notepad++</ClassName2Close>
 	
 	<!-- Optional.
-	This is the title to display on the messagebox title bar.
-	If extraCmd is set (parameter is presentand the value is not empty), the 3rd button will be appear.
-	extraCmd (with its wParam and lParam) will be sent to the handle of application indicated in ClassName2Close
+	This is the title to display on the message box title bar.
+	
+	If extraCmd is set (parameter is present and the value is not empty), the 3rd button "Cancel" will be appear (beside "Yes" and "No" button).
+	extraCmd is the Windows Message (a numeric value) to notify your application that Cancel button is clicked by user.
+	extraCmd will be sent (with its wParam and lParam) to the handle of application indicated in ClassName2Close.
+	extraCmd, ecWparam and ecLparam are optional.
 	-->
 	<MessageBoxTitle extraCmd="" ecWparam="" ecLparam="">Notepad++ update</MessageBoxTitle>
 
diff --git a/PowerEditor/installer/nppSetup.nsi b/PowerEditor/installer/nppSetup.nsi
index 932c207f..56670475 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.7.7"
+!define APPVERSION "6.7.8"
 !define APPNAMEANDVERSION "${APPNAME} v${APPVERSION}"
 !define VERSION_MAJOR 6
-!define VERSION_MINOR 77
+!define VERSION_MINOR 78
 
 !define APPWEBSITE "http://notepad-plus-plus.org/"
 
@@ -1060,6 +1060,9 @@ SectionGroup "Localization" localization
 	${MementoUnselectedSection} "Tagalog" tagalog
 		CopyFiles "$TEMP\nppLocalization\tagalog.xml" "$INSTDIR\localization\tagalog.xml"
 	${MementoSectionEnd}
+	${MementoUnselectedSection} "Tajik" tajik
+		CopyFiles "$TEMP\nppLocalization\tajikCyrillic.xml" "$INSTDIR\localization\tajikCyrillic.xml"
+	${MementoSectionEnd}
 	${MementoUnselectedSection} "Tamil" tamil
 		CopyFiles "$TEMP\nppLocalization\tamil.xml" "$INSTDIR\localization\tamil.xml"
 	${MementoSectionEnd}
@@ -1213,9 +1216,9 @@ ${MementoSection} "Auto-Updater" AutoUpdater
 	File "..\bin\updater\GUP.exe"
 	File "..\bin\updater\libcurl.dll"
 	File "..\bin\updater\gup.xml"
-	File "..\bin\updater\License.txt"
+	File "..\bin\updater\LICENSE"
 	File "..\bin\updater\gpl.txt"
-	File "..\bin\updater\readme.txt"
+	File "..\bin\updater\README.md"
 ${MementoSectionEnd}
 
 /*
@@ -1777,6 +1780,9 @@ SectionGroup un.localization
 	Section un.tagalog
 		Delete "$INSTDIR\localization\tagalog.xml"
 	SectionEnd
+	Section un.tajik
+		Delete "$INSTDIR\localization\tajikCyrillic.xml"
+	SectionEnd
 	Section un.tamil
 		Delete "$INSTDIR\localization\tamil.xml"
 	SectionEnd
@@ -1823,8 +1829,10 @@ Section un.AutoUpdater
 	Delete "$INSTDIR\updater\libcurl.dll"
 	Delete "$INSTDIR\updater\gup.xml"
 	Delete "$INSTDIR\updater\License.txt"
+	Delete "$INSTDIR\updater\LICENSE"
 	Delete "$INSTDIR\updater\gpl.txt"
 	Delete "$INSTDIR\updater\readme.txt"
+	Delete "$INSTDIR\updater\README.md"
 	Delete "$INSTDIR\updater\getDownLoadUrl.php"
 	RMDir "$INSTDIR\updater\"
 SectionEnd  
diff --git a/PowerEditor/src/resource.h b/PowerEditor/src/resource.h
index 86d9fe1f..42b6e942 100644
--- a/PowerEditor/src/resource.h
+++ b/PowerEditor/src/resource.h
@@ -29,12 +29,12 @@
 #ifndef RESOURCE_H
 #define RESOURCE_H
 
-#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v6.7.7")
+#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v6.7.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.77\0")
-#define VERSION_DIGITALVALUE 6, 7, 7, 0
+#define VERSION_VALUE TEXT("6.78\0")
+#define VERSION_DIGITALVALUE 6, 7, 8, 0
 
 #ifndef IDC_STATIC
 #define IDC_STATIC	-1