diff --git a/PowerEditor/bin/change.log b/PowerEditor/bin/change.log index 060fd612c..fbcbcc2f5 100644 --- a/PowerEditor/bin/change.log +++ b/PowerEditor/bin/change.log @@ -34,15 +34,14 @@ Notepad++ v5.1 fixed bugs and added features (from v5.0.3) : Included plugins (Unicode): -1. TexFX v0.24a -2. MIME Tools v1.5 -3. NppExport v0.2.8 -4. Doc Monitor v2.2 -5. NppAutoIndent 1.2 -6. FTP_synchronize v0.9.6 -7. NppAutoIndent 1.2 -8. NppDocShare v0.1 - +1. MIME Tools v1.5 +2. NppExport v0.2.8 +3. Doc Monitor v2.2 +4. NppAutoIndent 1.2 +5. FTP_synchronize v0.9.6 +6. NppAutoIndent 1.2 +7. NppDocShare v0.1 + Included plugins (ANSI): 1. TexFX v0.24a diff --git a/PowerEditor/installer/nppSetup.nsi b/PowerEditor/installer/nppSetup.nsi index a92cc4245..9a2fb42d5 100644 --- a/PowerEditor/installer/nppSetup.nsi +++ b/PowerEditor/installer/nppSetup.nsi @@ -650,7 +650,7 @@ SubSectionEnd SubSection "Plugins" Plugins SetOverwrite on - +/* Section "NPPTextFX" NPPTextFX SetOutPath "$INSTDIR\plugins" File "..\bin\plugins\NPPTextFX.dll" @@ -671,7 +671,7 @@ SubSection "Plugins" Plugins SetOutPath "$INSTDIR\plugins\doc" File "..\bin\plugins\doc\NPPTextFXdemo.TXT" SectionEnd - +*/ Section "NppDocShare" NppDocShare Delete "$INSTDIR\plugins\NppDocShare.dll" diff --git a/PowerEditor/src/ScitillaComponent/FunctionCallTip.cpp b/PowerEditor/src/ScitillaComponent/FunctionCallTip.cpp index 7853823ab..98bf7ccf0 100644 --- a/PowerEditor/src/ScitillaComponent/FunctionCallTip.cpp +++ b/PowerEditor/src/ScitillaComponent/FunctionCallTip.cpp @@ -46,7 +46,7 @@ inline bool match(TCHAR c1, TCHAR c2) { return false; } -//test generic_string case insensitive ala Scintilla +//test string case insensitive ala Scintilla //0 if equal, <0 of before, >0 if after (name1 that is) int testNameNoCase(const TCHAR * name1, const TCHAR * name2, int len = -1) { if (len == -1) { @@ -357,7 +357,7 @@ void FunctionCallTip::showCalltip() { lstrcat(textBuffer, curRetValText); lstrcat(textBuffer, TEXT(" ")); lstrcat(textBuffer, _funcName); - lstrcat(textBuffer, TEXT(" (L")); + lstrcat(textBuffer, TEXT(" (")); int highlightstart = 0; int highlightend = 0; @@ -368,7 +368,7 @@ void FunctionCallTip::showCalltip() { } lstrcat(textBuffer, params.at(i)); if (i < nrParams-1) - lstrcat(textBuffer, TEXT(", L")); + lstrcat(textBuffer, TEXT(", ")); } lstrcat(textBuffer, TEXT(")"));