diff --git a/PowerEditor/bin/change.log b/PowerEditor/bin/change.log index cae2cecd1..656f774ab 100644 --- a/PowerEditor/bin/change.log +++ b/PowerEditor/bin/change.log @@ -1,3 +1,12 @@ +Notepad++ v5.6.7 new features and fixed bugs (from v5.6.6) : + +1. Fix "Find in files" crash bug. +2. Focus (switch to) the dirty document while asking to save unsaved document when user close Notepad++. +3. Fix the bug while giving command C:\NppDir>notepad++ (w/o quote), npp try to open file "notepad++". +4. Enlarge regconition of clickable link from "http://" to any URI. +5. Fix the bug while changing the language list in Style Configurator, the "Save and close" button is enabled. + + Notepad++ v5.6.6 new features and fixed bugs (from v5.6.5) : 1. Fixed Search bug with Chinese/Japanese/Korean characters. diff --git a/PowerEditor/bin/npp.pdb b/PowerEditor/bin/npp.pdb index af527fc47..bcb495213 100644 Binary files a/PowerEditor/bin/npp.pdb and b/PowerEditor/bin/npp.pdb differ diff --git a/PowerEditor/installer/nativeLang/brazilian_portuguese.xml b/PowerEditor/installer/nativeLang/brazilian_portuguese.xml index 51229ca6e..12b1d5e09 100644 --- a/PowerEditor/installer/nativeLang/brazilian_portuguese.xml +++ b/PowerEditor/installer/nativeLang/brazilian_portuguese.xml @@ -17,7 +17,7 @@ - + @@ -26,14 +26,33 @@ - - + + + + + - - + + + + + + + + + + + + + + + + + + @@ -121,7 +140,24 @@ - + + + + + + + + + + + + + + + + + + @@ -392,6 +428,8 @@ + + @@ -407,10 +445,7 @@ - - - - + @@ -522,6 +557,7 @@ + diff --git a/PowerEditor/installer/nativeLang/italian.xml b/PowerEditor/installer/nativeLang/italian.xml index 2341645ca..e3cc4bc28 100644 --- a/PowerEditor/installer/nativeLang/italian.xml +++ b/PowerEditor/installer/nativeLang/italian.xml @@ -1,7 +1,7 @@ @@ -32,10 +32,10 @@ - - - - + + + + @@ -161,6 +161,8 @@ + + diff --git a/PowerEditor/installer/nativeLang/norwegian.xml b/PowerEditor/installer/nativeLang/norwegian.xml index 4ab2ec7c3..bb38732ba 100644 --- a/PowerEditor/installer/nativeLang/norwegian.xml +++ b/PowerEditor/installer/nativeLang/norwegian.xml @@ -7,13 +7,13 @@ - + - + - + @@ -21,25 +21,25 @@ - + - + - + - - + + - + @@ -47,7 +47,7 @@ - + @@ -63,20 +63,20 @@ - - + + - - + + - + - - - + + + @@ -85,102 +85,102 @@ - + - - + + - + - + - + - - + + - + - - - - - - - - - - - + + + + + + + + + + + - - + + - + - - - + + + - - + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - + + - + - + - - + + - - + + @@ -196,13 +196,13 @@ - + - - + + @@ -210,59 +210,59 @@ - + - + - + - - + + - - + + + - - + + - - + + - + - + - - + + - - - + + + - @@ -273,7 +273,7 @@ - + @@ -283,13 +283,13 @@ - - - + + + - + @@ -302,25 +302,25 @@ - + - - + + - + - - + + - + @@ -333,10 +333,10 @@ - + - - + + @@ -354,44 +354,45 @@ - + - + - + - - + + - + - - + + - + - - + + + - + - + - + - + - + @@ -419,43 +420,43 @@ - - - + + + - + - - - + + + - + - + - + - + @@ -465,7 +466,7 @@ - + @@ -478,24 +479,24 @@ - - + + - - - + + + - + - - + + @@ -504,13 +505,13 @@ - - + + - + - + @@ -523,7 +524,7 @@ - + diff --git a/PowerEditor/installer/nppSetup.nsi b/PowerEditor/installer/nppSetup.nsi index 038c65348..6e719dc98 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.6.6" -!define APPNAMEANDVERSION "Notepad++ v5.6.6" +!define APPVERSION "5.6.7" +!define APPNAMEANDVERSION "Notepad++ v5.6.7" !define VERSION_MAJOR 5 -!define VERSION_MINOR 66 +!define VERSION_MINOR 67 !define APPWEBSITE "http://notepad-plus.sourceforge.net/" @@ -29,7 +29,7 @@ Name "${APPNAMEANDVERSION}" InstallDir "$PROGRAMFILES\Notepad++" InstallDirRegKey HKLM "Software\${APPNAME}" "" -OutFile ".\build\npp.5.6.6.Installer.exe" +OutFile ".\build\npp.5.6.7.Installer.exe" ; GetWindowsVersion ; diff --git a/PowerEditor/src/MISC/Common/Common.cpp b/PowerEditor/src/MISC/Common/Common.cpp index 66e131d06..e895399bb 100644 --- a/PowerEditor/src/MISC/Common/Common.cpp +++ b/PowerEditor/src/MISC/Common/Common.cpp @@ -169,10 +169,10 @@ void ScreenRectToClientRect(HWND hWnd, RECT* rect) int filter(unsigned int code, struct _EXCEPTION_POINTERS *) { - if (code == EXCEPTION_ACCESS_VIOLATION) - return EXCEPTION_EXECUTE_HANDLER; + if (code == EXCEPTION_ACCESS_VIOLATION) + return EXCEPTION_EXECUTE_HANDLER; - return EXCEPTION_CONTINUE_SEARCH; + return EXCEPTION_CONTINUE_SEARCH; } bool isInList(const TCHAR *token, const TCHAR *list) { @@ -260,46 +260,46 @@ const wchar_t * WcharMbcsConvertor::char2wchar(const char * mbcs2Convert, UINT c // which are converted to the corresponding indexes in the returned wchar_t string. const wchar_t * WcharMbcsConvertor::char2wchar(const char * mbcs2Convert, UINT codepage, int *mstart, int *mend) { - if (!_wideCharStr) - { - _wideCharStr = new wchar_t[initSize]; - _wideCharAllocLen = initSize; - } + if (!_wideCharStr) + { + _wideCharStr = new wchar_t[initSize]; + _wideCharAllocLen = initSize; + } - int len = MultiByteToWideChar(codepage, 0, mbcs2Convert, -1, _wideCharStr, 0); - if (len > 0) - { - if (len > int(_wideCharAllocLen)) - { - delete [] _wideCharStr; - _wideCharAllocLen = len; - _wideCharStr = new wchar_t[_wideCharAllocLen]; - } - len = MultiByteToWideChar(codepage, 0, mbcs2Convert, -1, _wideCharStr, len); + int len = MultiByteToWideChar(codepage, 0, mbcs2Convert, -1, _wideCharStr, 0); + if (len > 0) + { + if (len > int(_wideCharAllocLen)) + { + delete [] _wideCharStr; + _wideCharAllocLen = len; + _wideCharStr = new wchar_t[_wideCharAllocLen]; + } + len = MultiByteToWideChar(codepage, 0, mbcs2Convert, -1, _wideCharStr, len); - if ((size_t)*mstart < strlen(mbcs2Convert) && (size_t)*mend < strlen(mbcs2Convert)) - { - *mstart = MultiByteToWideChar(codepage, 0, mbcs2Convert, *mstart, _wideCharStr, 0); - *mend = MultiByteToWideChar(codepage, 0, mbcs2Convert, *mend, _wideCharStr, 0); - if (*mstart >= len || *mend >= len) - { - *mstart = 0; - *mend = 0; - } - } - else - { - *mstart = 0; - *mend = 0; - } - } - else - { - _wideCharStr[0] = 0; - *mstart = 0; - *mend = 0; - } - return _wideCharStr; + if ((size_t)*mstart < strlen(mbcs2Convert) && (size_t)*mend < strlen(mbcs2Convert)) + { + *mstart = MultiByteToWideChar(codepage, 0, mbcs2Convert, *mstart, _wideCharStr, 0); + *mend = MultiByteToWideChar(codepage, 0, mbcs2Convert, *mend, _wideCharStr, 0); + if (*mstart >= len || *mend >= len) + { + *mstart = 0; + *mend = 0; + } + } + else + { + *mstart = 0; + *mend = 0; + } + } + else + { + _wideCharStr[0] = 0; + *mstart = 0; + *mend = 0; + } + return _wideCharStr; } const char * WcharMbcsConvertor::wchar2char(const wchar_t * wcharStr2Convert, UINT codepage) @@ -346,7 +346,7 @@ const char * WcharMbcsConvertor::wchar2char(const wchar_t * wcharStr2Convert, UI } len = WideCharToMultiByte(codepage, 0, wcharStr2Convert, -1, _multiByteStr, len, NULL, NULL); // not needed? - if ((int)*mstart < lstrlen(wcharStr2Convert) && (int)*mend < lstrlen(wcharStr2Convert)) + if ((int)*mstart < lstrlenW(wcharStr2Convert) && (int)*mend < lstrlenW(wcharStr2Convert)) { *mstart = WideCharToMultiByte(codepage, 0, wcharStr2Convert, *mstart, _multiByteStr, 0, NULL, NULL); *mend = WideCharToMultiByte(codepage, 0, wcharStr2Convert, *mend, _multiByteStr, 0, NULL, NULL); diff --git a/PowerEditor/src/Notepad_plus.cpp b/PowerEditor/src/Notepad_plus.cpp index b43dee806..f9bc39a96 100644 --- a/PowerEditor/src/Notepad_plus.cpp +++ b/PowerEditor/src/Notepad_plus.cpp @@ -1598,7 +1598,7 @@ void Notepad_plus::addHotSpot(bool docIsModifing) vector > hotspotStylers; int style_hotspot = 30; - int posFound = _pEditView->execute(SCI_SEARCHINTARGET, strlen(URL_HTTP_REG_EXPR), (LPARAM)URL_HTTP_REG_EXPR); + int posFound = _pEditView->execute(SCI_SEARCHINTARGET, strlen(URL_REG_EXPR), (LPARAM)URL_REG_EXPR); while (posFound != -1) { @@ -1679,7 +1679,7 @@ void Notepad_plus::addHotSpot(bool docIsModifing) _pEditView->execute(SCI_SETTARGETSTART, posFound + foundTextLen); _pEditView->execute(SCI_SETTARGETEND, endPos); - posFound = _pEditView->execute(SCI_SEARCHINTARGET, strlen(URL_HTTP_REG_EXPR), (LPARAM)URL_HTTP_REG_EXPR); + posFound = _pEditView->execute(SCI_SEARCHINTARGET, strlen(URL_REG_EXPR), (LPARAM)URL_REG_EXPR); } _pEditView->execute(SCI_STARTSTYLING, endStyle, 0xFF); diff --git a/PowerEditor/src/Notepad_plus.h b/PowerEditor/src/Notepad_plus.h index 94c000657..c2e3bacf9 100644 --- a/PowerEditor/src/Notepad_plus.h +++ b/PowerEditor/src/Notepad_plus.h @@ -113,7 +113,7 @@ #define MENU 0x01 #define TOOLBAR 0x02 -#define URL_HTTP_REG_EXPR "http://[a-z0-9_\\-\\+~.:?&@=/%#]*" +#define URL_REG_EXPR "[A-Za-z]+://[A-Za-z0-9_\\-\\+~.:?&@=/%#,;\\{\\}\\(\\)\\[\\]\\|\\*\\!\\\\]+" enum FileTransferMode { TransferClone = 0x01, diff --git a/PowerEditor/src/NppIO.cpp b/PowerEditor/src/NppIO.cpp index e817b8d15..5141834eb 100644 --- a/PowerEditor/src/NppIO.cpp +++ b/PowerEditor/src/NppIO.cpp @@ -21,7 +21,7 @@ BufferID Notepad_plus::doOpen(const TCHAR *fileName, bool isReadOnly, int encoding) -{ +{ TCHAR longFileName[MAX_PATH]; ::GetFullPathName(fileName, MAX_PATH, longFileName, NULL); diff --git a/PowerEditor/src/NppNotification.cpp b/PowerEditor/src/NppNotification.cpp index 72276f79e..f07e2e4d6 100644 --- a/PowerEditor/src/NppNotification.cpp +++ b/PowerEditor/src/NppNotification.cpp @@ -652,7 +652,7 @@ BOOL Notepad_plus::notify(SCNotification *notification) notifyView->execute(SCI_SETTARGETSTART, startPos); notifyView->execute(SCI_SETTARGETEND, endPos); - int posFound = notifyView->execute(SCI_SEARCHINTARGET, strlen(URL_HTTP_REG_EXPR), (LPARAM)URL_HTTP_REG_EXPR); + int posFound = notifyView->execute(SCI_SEARCHINTARGET, strlen(URL_REG_EXPR), (LPARAM)URL_REG_EXPR); if (posFound != -1) { startPos = int(notifyView->execute(SCI_GETTARGETSTART)); diff --git a/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.cpp b/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.cpp index 99dde9bcb..d8d724938 100644 --- a/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.cpp +++ b/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.cpp @@ -853,7 +853,5 @@ void WordStyleDlg::apply() globalStyles = _globalStyles; ::EnableWindow(::GetDlgItem(_hSelf, IDOK), FALSE); - //_isDirty = false; - //_isSync = false; ::SendMessage(_hParent, WM_UPDATESCINTILLAS, 0, 0); } diff --git a/PowerEditor/src/resource.h b/PowerEditor/src/resource.h index 6a7a9cd9a..8b6da91e3 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.6.6") +#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v5.6.7") // 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.66\0") -#define VERSION_DIGITALVALUE 5, 6, 6, 0 +#define VERSION_VALUE TEXT("5.67\0") +#define VERSION_DIGITALVALUE 5, 6, 7, 0 #ifdef UNICODE #define UNICODE_ANSI_MODE TEXT("(UNICODE)") diff --git a/PowerEditor/src/stylers.model.xml b/PowerEditor/src/stylers.model.xml index 704e300b7..c42ef228f 100644 --- a/PowerEditor/src/stylers.model.xml +++ b/PowerEditor/src/stylers.model.xml @@ -265,7 +265,7 @@ - +