diff --git a/PowerEditor/bin/change.log b/PowerEditor/bin/change.log index 15db61323..1c1a9b58c 100644 --- a/PowerEditor/bin/change.log +++ b/PowerEditor/bin/change.log @@ -1,9 +1,6 @@ -Notepad++ v6.1.1 modification and fixed bugs: +Notepad++ v6.1.2 fixed bugs: -1. Enhance project's license (GPL) to avoid the other malicious websites bundle Notepad++ release with their parasite software. -2. Fix selectAll-copy-paste on the same document crash bug while document map has been activated. -3. Fix a regression about auto-completion feature. -4. Fix focus on document map problem after its launch. +1. Fix Notepad++ hanging bug due to the opened file containing a half of UTF-8 double byte sequence at the end of the file. Included plugins: diff --git a/PowerEditor/bin/npp.pdb b/PowerEditor/bin/npp.pdb index 92690ec54..80e775947 100644 Binary files a/PowerEditor/bin/npp.pdb and b/PowerEditor/bin/npp.pdb differ diff --git a/PowerEditor/installer/nativeLang/czech.xml b/PowerEditor/installer/nativeLang/czech.xml index 560c4145f..f575e7098 100644 --- a/PowerEditor/installer/nativeLang/czech.xml +++ b/PowerEditor/installer/nativeLang/czech.xml @@ -1,7 +1,7 @@ @@ -206,6 +206,7 @@ + @@ -324,6 +325,7 @@ + @@ -468,7 +470,7 @@ - + @@ -518,7 +520,8 @@ - + + @@ -610,7 +613,7 @@ - + @@ -684,6 +687,8 @@ + + @@ -703,19 +708,25 @@ - + + + - + + + + + diff --git a/PowerEditor/installer/nativeLang/uyghur.xml b/PowerEditor/installer/nativeLang/uyghur.xml index 68928fb55..e51f70c55 100644 --- a/PowerEditor/installer/nativeLang/uyghur.xml +++ b/PowerEditor/installer/nativeLang/uyghur.xml @@ -1,8 +1,10 @@ - + + + - +
@@ -22,27 +24,27 @@ - + - + - + - - + + - - - - + + + + - - + + @@ -67,8 +69,8 @@ - - + + @@ -78,9 +80,9 @@ - + - + @@ -89,36 +91,36 @@ - - - - - - - + + + + + + + - + - - + + - - - - - + + + + + - - - - + + + + - + @@ -126,18 +128,18 @@ - + - - - + + + - - - - - + + + + + @@ -172,29 +174,29 @@ - + - + - - - + + + - + - + - - - + + + - - - + + + @@ -219,7 +221,7 @@ - + @@ -236,8 +238,8 @@ - - + + @@ -247,29 +249,29 @@ - + - - - - + + + + - +
- + - + @@ -292,18 +294,18 @@ - + - + - - + + @@ -337,8 +339,8 @@ - - + + @@ -355,12 +357,12 @@ - + - + @@ -376,8 +378,8 @@ - - + + @@ -389,18 +391,18 @@ - + - + - + @@ -409,28 +411,28 @@ - + - - - + + + - - + + - + - + @@ -440,7 +442,7 @@ - + @@ -460,12 +462,12 @@ - + - + - + @@ -486,15 +488,15 @@ - - + + - - + + - - + + @@ -506,7 +508,7 @@ - + @@ -530,24 +532,24 @@ - + - + - - + + - - + + - - + + @@ -563,13 +565,13 @@ - + - + - + @@ -608,16 +610,16 @@ - + - + - - + + @@ -629,12 +631,12 @@ - - + + - - + + @@ -642,8 +644,8 @@ - - + + @@ -651,7 +653,7 @@ - + diff --git a/PowerEditor/installer/nppSetup.nsi b/PowerEditor/installer/nppSetup.nsi index 66fcd578a..03e8dd86f 100644 --- a/PowerEditor/installer/nppSetup.nsi +++ b/PowerEditor/installer/nppSetup.nsi @@ -28,10 +28,10 @@ ; Define the application name !define APPNAME "Notepad++" -!define APPVERSION "6.1.1" +!define APPVERSION "6.1.2" !define APPNAMEANDVERSION "${APPNAME} v${APPVERSION}" !define VERSION_MAJOR 6 -!define VERSION_MINOR 11 +!define VERSION_MINOR 12 !define APPWEBSITE "http://notepad-plus-plus.org/" diff --git a/PowerEditor/src/resource.h b/PowerEditor/src/resource.h index 89f65958a..9e9320017 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.1.1") +#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v6.1.2") // 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.11\0") -#define VERSION_DIGITALVALUE 6, 1, 1, 0 +#define VERSION_VALUE TEXT("6.12\0") +#define VERSION_DIGITALVALUE 6, 1, 2, 0 #ifdef UNICODE #define UNICODE_ANSI_MODE TEXT("(UNICODE)") diff --git a/PowerEditor/src/winmain.cpp b/PowerEditor/src/winmain.cpp index 56a7e23b4..98e1d321a 100644 --- a/PowerEditor/src/winmain.cpp +++ b/PowerEditor/src/winmain.cpp @@ -277,7 +277,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE, LPSTR, int) pNppParameters->destroyInstance(); MainFileManager->destroyInstance(); - int sw; + int sw = 0; if (::IsZoomed(hNotepad_plus)) sw = SW_MAXIMIZE;