diff --git a/PowerEditor/bin/change.log b/PowerEditor/bin/change.log index 91bd3a825..cd64b4b34 100644 --- a/PowerEditor/bin/change.log +++ b/PowerEditor/bin/change.log @@ -1,3 +1,16 @@ +Notepad++ v5.8.6 new features and fixed bugs (from v5.8.5) : + +1. Fix langs.xml 0 length problem while user ends session without closing Notepad++. +2. Fix empty line count failure (RegExpr). +3. Fix task list display glitch under Windows 7. +4. Add trim functions (header/trailing/compact feature). +5. Add white space and TAB conversion features. +6. Fix folding margin to be displayed when opening Notepad++ with a new/empty file (Normal text). +7. Fix auto-completion detection language bug. +8. Fix the changing theme settings makes switch back to the default theme bug. +9. Make english.xml customizable. + + Notepad++ v5.8.5 new features and fixed bugs (from v5.8.4) : 1. Fix Shell Extension icon absent issue. diff --git a/PowerEditor/bin/npp.pdb b/PowerEditor/bin/npp.pdb index ef37798e5..80f65399b 100644 Binary files a/PowerEditor/bin/npp.pdb and b/PowerEditor/bin/npp.pdb differ diff --git a/PowerEditor/bin/readme.txt b/PowerEditor/bin/readme.txt index d97489cc2..74003ce1f 100644 --- a/PowerEditor/bin/readme.txt +++ b/PowerEditor/bin/readme.txt @@ -33,9 +33,6 @@ Notepad++ wiki: Notepad++ support: http://sourceforge.net/projects/notepad-plus/support - -Notepad++ channel: - irc://irc.freenode.net:6667/notepad++ Notepad++ team: diff --git a/PowerEditor/installer/nativeLang/spanish_ar.xml b/PowerEditor/installer/nativeLang/spanish_ar.xml index 754bf0785..1a60139e4 100644 --- a/PowerEditor/installer/nativeLang/spanish_ar.xml +++ b/PowerEditor/installer/nativeLang/spanish_ar.xml @@ -1,483 +1,590 @@ - +
- + - - - - - - - - - + + + + + + + + + - - + + - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + +
- - - - - - - + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + - - - - - + + + + + - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - \ No newline at end of file + diff --git a/PowerEditor/installer/nppSetup.nsi b/PowerEditor/installer/nppSetup.nsi index 9a068a3ee..226816bb7 100644 --- a/PowerEditor/installer/nppSetup.nsi +++ b/PowerEditor/installer/nppSetup.nsi @@ -18,10 +18,10 @@ ; Define the application name !define APPNAME "Notepad++" -!define APPVERSION "5.8.5" -!define APPNAMEANDVERSION "Notepad++ v5.8.5" +!define APPVERSION "5.8.6" +!define APPNAMEANDVERSION "Notepad++ v5.8.6" !define VERSION_MAJOR 5 -!define VERSION_MINOR 85 +!define VERSION_MINOR 86 !define APPWEBSITE "http://notepad-plus-plus.org/" @@ -29,7 +29,7 @@ Name "${APPNAMEANDVERSION}" InstallDir "$PROGRAMFILES\Notepad++" InstallDirRegKey HKLM "Software\${APPNAME}" "" -OutFile ".\build\npp.5.8.5.Installer.exe" +OutFile ".\build\npp.5.8.6.Installer.exe" ; GetWindowsVersion ; diff --git a/PowerEditor/installer/packageAll.bat b/PowerEditor/installer/packageAll.bat index ca202daaa..0d28351ed 100644 --- a/PowerEditor/installer/packageAll.bat +++ b/PowerEditor/installer/packageAll.bat @@ -20,6 +20,33 @@ echo on del /F /Q .\build\*.* +rem Notepad++ minimalist package +del /F /S /Q .\zipped.package.release\minimalist\*.* +copy /Y ..\bin\license.txt .\minimalist\ +If ErrorLevel 1 PAUSE +copy /Y ..\bin\readme.txt .\minimalist\ +If ErrorLevel 1 PAUSE +copy /Y ..\bin\change.log .\minimalist\ +If ErrorLevel 1 PAUSE +copy /Y ..\src\config.model.xml .\minimalist\ +If ErrorLevel 1 PAUSE +copy /Y ..\src\langs.model.xml .\minimalist\ +If ErrorLevel 1 PAUSE +copy /Y ..\src\stylers.model.xml .\minimalist\ +If ErrorLevel 1 PAUSE +copy /Y ..\src\contextMenu.xml .\minimalist\ +If ErrorLevel 1 PAUSE +copy /Y ..\src\shortcuts.xml .\minimalist\ +If ErrorLevel 1 PAUSE +copy /Y ..\bin\doLocalConf.xml .\minimalist\ +If ErrorLevel 1 PAUSE +copy /Y ..\bin\"notepad++.exe" .\minimalist\ +If ErrorLevel 1 PAUSE +copy /Y ..\bin\SciLexer.dll .\minimalist\ +If ErrorLevel 1 PAUSE + + +rem Notepad++ Unicode package del /F /S /Q .\zipped.package.release\unicode\*.* copy /Y ..\bin\license.txt .\zipped.package.release\unicode\ If ErrorLevel 1 PAUSE @@ -61,6 +88,7 @@ If ErrorLevel 1 PAUSE copy /Y ".\themes\*.xml" .\zipped.package.release\unicode\themes\ If ErrorLevel 1 PAUSE +rem Notepad++ ANSI package del /F /S /Q .\zipped.package.release\ansi\npp.pdb del /F /S /Q .\zipped.package.release\ansi\config.xml del /F /S /Q .\zipped.package.release\ansi\langs.xml @@ -96,6 +124,8 @@ copy /Y ".\themes\*.xml" .\zipped.package.release\ansi\themes\ If ErrorLevel 1 PAUSE +"C:\Program Files\7-Zip\7z.exe" a -r .\build\npp.bin.minimalist.7z .\minimalist\* +If ErrorLevel 1 PAUSE "C:\Program Files\7-Zip\7z.exe" a -tzip -r .\build\npp.bin.zip .\zipped.package.release\* If ErrorLevel 1 PAUSE "C:\Program Files\7-Zip\7z.exe" a -r .\build\npp.bin.7z .\zipped.package.release\* @@ -114,10 +144,12 @@ for %%a in (npp.*.Installer.exe) do ( set nppInstallerVar=%%a set zipvar=!nppInstallerVar:Installer.exe=bin.zip! set 7zvar=!nppInstallerVar:Installer.exe=bin.7z! + set 7zvarMin=!nppInstallerVar:Installer.exe=bin.minimalist.7z! rem set md5var=!nppInstallerVar:Installer.exe=release.md5! ) ren npp.bin.zip !zipvar! ren npp.bin.7z !7zvar! +ren npp.bin.minimalist.7z !7zvarMin! rem ..\externalTools\md5.exe -o!md5var! !nppInstallerVar! !zipvar! !7zvar! cd .. diff --git a/PowerEditor/src/localizationString.h b/PowerEditor/src/localizationString.h index 286b2e999..8d187bc07 100644 Binary files a/PowerEditor/src/localizationString.h and b/PowerEditor/src/localizationString.h differ diff --git a/PowerEditor/src/resource.h b/PowerEditor/src/resource.h index 6e4e690da..fdc8ccad2 100644 --- a/PowerEditor/src/resource.h +++ b/PowerEditor/src/resource.h @@ -18,12 +18,12 @@ #ifndef RESOURCE_H #define RESOURCE_H -#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v5.8.5") +#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v5.8.6") // 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("5.85\0") -#define VERSION_DIGITALVALUE 5, 8, 5, 0 +#define VERSION_VALUE TEXT("5.86\0") +#define VERSION_DIGITALVALUE 5, 8, 6, 0 #ifdef UNICODE #define UNICODE_ANSI_MODE TEXT("(UNICODE)")