tyler.durden
/
notepad-plus-plus
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[BUG_FIXED] Fix Find in Files search in both Unicode/Ainsi files. 

git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository@362 f5eea248-9336-0410-98b8-ebc06183d4e3
This commit is contained in:
donho 2008-12-06 23:43:09 +00:00
parent 9552d39b01
commit 53a52f557d
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
PowerEditor/installer/nppSetup.nsi
View File

@ -17,16 +17,16 @@
; Define the application name ; Define the application name
!define APPNAME "Notepad++" !define APPNAME "Notepad++"
!define APPNAMEANDVERSION "Notepad++ v5.1.1" !define APPNAMEANDVERSION "Notepad++ v5.1.2"
!define VERSION_MAJOR 5 !define VERSION_MAJOR 5
!define VERSION_MINOR 11 !define VERSION_MINOR 12
; Main Install settings ; Main Install settings
Name "${APPNAMEANDVERSION}" Name "${APPNAMEANDVERSION}"
InstallDir "$PROGRAMFILES\Notepad++" InstallDir "$PROGRAMFILES\Notepad++"
InstallDirRegKey HKLM "Software\${APPNAME}" "" InstallDirRegKey HKLM "Software\${APPNAME}" ""
OutFile "..\bin\npp.5.1.1.Installer.exe" OutFile "..\bin\npp.5.1.2.Installer.exe"
; GetWindowsVersion ; GetWindowsVersion
; ;
@ -524,9 +524,12 @@ commun:
MessageBox MB_OK "Due to the problem of compability with this version,$\nFunctionList.dll is about to be deleted.$\nYou can download it via menu $\"?->Get more plugins$\" if you really need it." MessageBox MB_OK "Due to the problem of compability with this version,$\nFunctionList.dll is about to be deleted.$\nYou can download it via menu $\"?->Get more plugins$\" if you really need it."
Delete "$INSTDIR\plugins\FunctionList.dll" Delete "$INSTDIR\plugins\FunctionList.dll"
IfFileExists "$INSTDIR\plugins\NPPTextFX.ini" 0 +3 IfFileExists "$INSTDIR\plugins\NPPTextFX.ini" 0 +2
Delete "$INSTDIR\plugins\NPPTextFX.ini" Delete "$INSTDIR\plugins\NPPTextFX.ini"
IfFileExists "$INSTDIR\plugins\NppAutoIndent.dll" 0 +3
MessageBox MB_OK "Due to the stabilty issue,$\NppAutoIndent.dll is about to be deleted.$\nYou can download it via menu $\"?->Get more plugins$\" if you really need it."
Delete "$INSTDIR\plugins\NppAutoIndent.dll"
; detect the right of ; detect the right of
UserInfo::GetAccountType UserInfo::GetAccountType
Pop $1 Pop $1
@ -719,6 +722,7 @@ SubSection "Plugins" Plugins
File "..\bin\plugins\NppExport.dll" File "..\bin\plugins\NppExport.dll"
SectionEnd SectionEnd
/*
Section "NppAutoIndent" NppAutoIndent Section "NppAutoIndent" NppAutoIndent
Delete "$INSTDIR\plugins\NppAutoIndent.dll" Delete "$INSTDIR\plugins\NppAutoIndent.dll"
SetOutPath "$INSTDIR\plugins" SetOutPath "$INSTDIR\plugins"
@ -733,7 +737,7 @@ SubSection "Plugins" Plugins
File "..\bin\plugins\Config\NppAutoIndent.ini" File "..\bin\plugins\Config\NppAutoIndent.ini"
SectionEnd SectionEnd
*/
Section "Document Monitor" DocMonitor Section "Document Monitor" DocMonitor
Delete "$INSTDIR\plugins\docMonitor.dll" Delete "$INSTDIR\plugins\docMonitor.dll"
SetOutPath "$INSTDIR\plugins" SetOutPath "$INSTDIR\plugins"

1
PowerEditor/src/Notepad_plus.cpp
View File

@ -1602,6 +1602,7 @@ bool Notepad_plus::findInFiles()
{ {
Buffer * pBuf = MainFileManager->getBufferByID(id); Buffer * pBuf = MainFileManager->getBufferByID(id);
_invisibleEditView.execute(SCI_SETDOCPOINTER, 0, pBuf->getDocument()); _invisibleEditView.execute(SCI_SETDOCPOINTER, 0, pBuf->getDocument());
_invisibleEditView.execute(SCI_SETCODEPAGE, pBuf->getUnicodeMode() == uni8Bit?0:SC_CP_UTF8);
generic_string str = TEXT("File: "); generic_string str = TEXT("File: ");
str += fileNames.at(i); str += fileNames.at(i);