diff --git a/PowerEditor/bin/change.log b/PowerEditor/bin/change.log index a46baa1d9..70963bd5a 100644 --- a/PowerEditor/bin/change.log +++ b/PowerEditor/bin/change.log @@ -1,3 +1,8 @@ +Notepad++ v6.4.5 bug fixes: + +1. Fix a regression on recent files history. + + Notepad++ v6.4.4 new features and bug fixes: 1. Fix a crash issue while there's missing tag in functionList.xml. diff --git a/PowerEditor/bin/npp.pdb b/PowerEditor/bin/npp.pdb index ea2b62f5d..beb005398 100644 Binary files a/PowerEditor/bin/npp.pdb and b/PowerEditor/bin/npp.pdb differ diff --git a/PowerEditor/installer/nppSetup.nsi b/PowerEditor/installer/nppSetup.nsi index 1bf924cf5..60eff6890 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.4.4" +!define APPVERSION "6.4.5" !define APPNAMEANDVERSION "${APPNAME} v${APPVERSION}" !define VERSION_MAJOR 6 -!define VERSION_MINOR 44 +!define VERSION_MINOR 45 !define APPWEBSITE "http://notepad-plus-plus.org/" diff --git a/PowerEditor/src/Notepad_plus.cpp b/PowerEditor/src/Notepad_plus.cpp index 393be447b..ae1b006e3 100644 --- a/PowerEditor/src/Notepad_plus.cpp +++ b/PowerEditor/src/Notepad_plus.cpp @@ -484,7 +484,7 @@ LRESULT Notepad_plus::init(HWND hwnd) //Add recent files HMENU hFileMenu = ::GetSubMenu(_mainMenuHandle, MENUINDEX_FILE); int nbLRFile = pNppParam->getNbLRFile(); - int pos = IDM_FILEMENU_LASTONE - IDM_FILE + 2; + int pos = IDM_FILEMENU_LASTONE - IDM_FILE + 1 /* +1 : because of IDM_FILE_PRINTNOW */; _lastRecentFileList.initMenu(hFileMenu, IDM_FILEMENU_LASTONE + 1, pos, pNppParam->putRecentFileInSubMenu()); _lastRecentFileList.setLangEncoding(_nativeLangSpeaker.getLangEncoding()); diff --git a/PowerEditor/src/menuCmdID.h b/PowerEditor/src/menuCmdID.h index 310132758..ba8726e8c 100644 --- a/PowerEditor/src/menuCmdID.h +++ b/PowerEditor/src/menuCmdID.h @@ -37,12 +37,10 @@ #define IDM_FILE_CLOSE (IDM_FILE + 3) #define IDM_FILE_CLOSEALL (IDM_FILE + 4) #define IDM_FILE_CLOSEALL_BUT_CURRENT (IDM_FILE + 5) - #define IDM_FILE_CLOSEALL_TOLEFT (IDM_FILE + 18) - #define IDM_FILE_CLOSEALL_TORIGHT (IDM_FILE + 19) #define IDM_FILE_SAVE (IDM_FILE + 6) #define IDM_FILE_SAVEALL (IDM_FILE + 7) #define IDM_FILE_SAVEAS (IDM_FILE + 8) - //#define IDM_FILE_ASIAN_LANG (IDM_FILE + 9) + #define IDM_FILE_CLOSEALL_TOLEFT (IDM_FILE + 9) #define IDM_FILE_PRINT (IDM_FILE + 10) #define IDM_FILE_PRINTNOW 1001 #define IDM_FILE_EXIT (IDM_FILE + 11) @@ -52,9 +50,10 @@ #define IDM_FILE_SAVECOPYAS (IDM_FILE + 15) #define IDM_FILE_DELETE (IDM_FILE + 16) #define IDM_FILE_RENAME (IDM_FILE + 17) + #define IDM_FILE_CLOSEALL_TORIGHT (IDM_FILE + 18) // To be updated if new menu item(s) is (are) added in menu "File" - #define IDM_FILEMENU_LASTONE IDM_FILE_RENAME + #define IDM_FILEMENU_LASTONE IDM_FILE_CLOSEALL_TORIGHT #define IDM_EDIT (IDM + 2000) #define IDM_EDIT_CUT (IDM_EDIT + 1) diff --git a/PowerEditor/src/resource.h b/PowerEditor/src/resource.h index e7cea33a7..657ed7bf1 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.4.4") +#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v6.4.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.44\0") -#define VERSION_DIGITALVALUE 6, 4, 4, 0 +#define VERSION_VALUE TEXT("6.45\0") +#define VERSION_DIGITALVALUE 6, 4, 5, 0 #ifdef UNICODE #define UNICODE_ANSI_MODE TEXT("(UNICODE)")