[RELEASE] Notepad++ v5.6.6 release.
[BUG_FIXED] Fixed Search bug with Chinese/Japanese/Korean characters. git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@605 f5eea248-9336-0410-98b8-ebc06183d4e3
This commit is contained in:
parent
5925d28aba
commit
691849d1d9
BIN
PowerEditor/bin/NppShell.dll
Normal file
BIN
PowerEditor/bin/NppShell.dll
Normal file
Binary file not shown.
BIN
PowerEditor/bin/NppShell64.dll
Normal file
BIN
PowerEditor/bin/NppShell64.dll
Normal file
Binary file not shown.
@ -1,3 +1,9 @@
|
|||||||
|
Notepad++ v5.6.6 new features and fixed bugs (from v5.6.5) :
|
||||||
|
|
||||||
|
1. Fixed Search bug with Chinese/Japanese/Korean characters.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
Notepad++ v5.6.5 new features and fixed bugs (from v5.6.4) :
|
Notepad++ v5.6.5 new features and fixed bugs (from v5.6.4) :
|
||||||
|
|
||||||
1. Fix loading encoding file making file corrupted (after saving).
|
1. Fix loading encoding file making file corrupted (after saving).
|
||||||
@ -70,9 +76,8 @@ Included plugins (Unicode):
|
|||||||
2. Spell Checker v1.3.3
|
2. Spell Checker v1.3.3
|
||||||
3. MIME Tools v1.6
|
3. MIME Tools v1.6
|
||||||
4. NppExport v0.2.8
|
4. NppExport v0.2.8
|
||||||
5. NppNetNote v0.1
|
5. Compare Plugin 1.5.5
|
||||||
6. Compare Plugin 1.5.5
|
6. Plugin Manager 0.9.3.0
|
||||||
7. Plugin Manager 0.9.3.0
|
|
||||||
|
|
||||||
|
|
||||||
Included plugins (ANSI):
|
Included plugins (ANSI):
|
||||||
@ -83,7 +88,7 @@ Included plugins (ANSI):
|
|||||||
4. MIME Tools v1.6
|
4. MIME Tools v1.6
|
||||||
5. NppExport v0.2.8
|
5. NppExport v0.2.8
|
||||||
6. Light Explorer v1.6
|
6. Light Explorer v1.6
|
||||||
7. NppNetNote v0.1
|
7. Compare Plugin 1.5.5
|
||||||
8. Compare Plugin 1.5.5
|
8. Plugin Manager 0.9.3.0
|
||||||
9. Plugin Manager 0.9.3.0
|
|
||||||
|
|
||||||
|
0
PowerEditor/bin/doLocalConf.xml
Normal file
0
PowerEditor/bin/doLocalConf.xml
Normal file
Binary file not shown.
BIN
PowerEditor/bin/nppIExplorerShell.exe
Normal file
BIN
PowerEditor/bin/nppIExplorerShell.exe
Normal file
Binary file not shown.
0
PowerEditor/installer/build/dummy
Normal file
0
PowerEditor/installer/build/dummy
Normal file
@ -1,7 +1,7 @@
|
|||||||
<?xml version="1.0" encoding="Windows-1252" ?>
|
<?xml version="1.0" encoding="Windows-1252" ?>
|
||||||
<NotepadPlus>
|
<NotepadPlus>
|
||||||
<Native-Langue name = "Dansk" filename="danish.xml" >
|
<Native-Langue name = "Dansk" filename="danish.xml" >
|
||||||
<!-- Updated for ver. 5.6.1 -->
|
<!-- Updated for ver. 5.6.5 -->
|
||||||
<Menu>
|
<Menu>
|
||||||
<Main>
|
<Main>
|
||||||
<!-- Main Menu Entries -->
|
<!-- Main Menu Entries -->
|
||||||
@ -28,10 +28,10 @@
|
|||||||
<Item posX = "1" posY = "13" name = "Ko&mmenter/afkommenter"/>
|
<Item posX = "1" posY = "13" name = "Ko&mmenter/afkommenter"/>
|
||||||
<Item posX = "1" posY = "14" name = "Au&tofuldførelse"/>
|
<Item posX = "1" posY = "14" name = "Au&tofuldførelse"/>
|
||||||
<Item posX = "1" posY = "15" name = "&EOL-konvertering"/>
|
<Item posX = "1" posY = "15" name = "&EOL-konvertering"/>
|
||||||
<Item posX = "2" posY = "14" name = "&Marker alle"/>
|
<Item posX = "2" posY = "16" name = "&Marker alle"/>
|
||||||
<Item posX = "2" posY = "15" name = "&Afmarker alle"/>
|
<Item posX = "2" posY = "17" name = "&Afmarker alle"/>
|
||||||
<Item posX = "2" posY = "16" name = "Hop op"/>
|
<Item posX = "2" posY = "18" name = "Hop op"/>
|
||||||
<Item posX = "2" posY = "17" name = "Hop ned"/>
|
<Item posX = "2" posY = "19" name = "Hop ned"/>
|
||||||
<Item posX = "3" posY = "4" name = "&Vis symbol"/>
|
<Item posX = "3" posY = "4" name = "&Vis symbol"/>
|
||||||
<Item posX = "3" posY = "5" name = "&Zoom"/>
|
<Item posX = "3" posY = "5" name = "&Zoom"/>
|
||||||
<Item posX = "3" posY = "6" name = "&Gå til/klon pågældende dokument"/>
|
<Item posX = "3" posY = "6" name = "&Gå til/klon pågældende dokument"/>
|
||||||
@ -160,6 +160,8 @@
|
|||||||
<Item id = "43045" name = "Vinduet Fundne resultater"/>
|
<Item id = "43045" name = "Vinduet Fundne resultater"/>
|
||||||
<Item id = "43046" name = "Næste fundne resultat"/>
|
<Item id = "43046" name = "Næste fundne resultat"/>
|
||||||
<Item id = "43047" name = "Forrige fundne resultat"/>
|
<Item id = "43047" name = "Forrige fundne resultat"/>
|
||||||
|
<Item id = "43048" name = "Marker og find næste"/>
|
||||||
|
+ <Item id = "43049" name = "Marker og find forrige"/>
|
||||||
|
|
||||||
|
|
||||||
<Item id = "44009" name = "Post-it"/>
|
<Item id = "44009" name = "Post-it"/>
|
||||||
@ -297,7 +299,7 @@
|
|||||||
<Item id = "1661" name = "F&ølg pågældende dok."/>
|
<Item id = "1661" name = "F&ølg pågældende dok."/>
|
||||||
<Item id = "1624" name = "Søgemåde"/>
|
<Item id = "1624" name = "Søgemåde"/>
|
||||||
<Item id = "1625" name = "&Normal"/>
|
<Item id = "1625" name = "&Normal"/>
|
||||||
<Item id = "1626" name = "&Udvidet (\n, \r, \t, \0, \x...)"/>
|
<Item id = "1626" name = "&Udvidet (\n, \r, \t, \0, \u, \x...)"/>
|
||||||
</Find>
|
</Find>
|
||||||
<GoToLine title = "Gå til linje #">
|
<GoToLine title = "Gå til linje #">
|
||||||
<Item id = "2007" name = "Linje"/>
|
<Item id = "2007" name = "Linje"/>
|
||||||
|
@ -1,11 +1,11 @@
|
|||||||
<?xml version="1.0" encoding="Windows-1252" ?>
|
<?xml version="1.0" encoding="Windows-1252" ?>
|
||||||
<!--
|
<!--
|
||||||
German localization for Notepad++ 5.6.1
|
German localization for Notepad++ 5.6.5
|
||||||
Last modified Mon, 7 December 2009 by Jan Schreiber.
|
Last modified Mon, 25 January 2010 by Jan Schreiber.
|
||||||
Please e-mail errors, suggestions etc. to janschreiber(at)users.sf.net.
|
Please e-mail errors, suggestions etc. to janschreiber(at)users.sf.net.
|
||||||
-->
|
-->
|
||||||
<NotepadPlus>
|
<NotepadPlus>
|
||||||
<Native-Langue name = "Deutsch" filename="german.xml">
|
<Native-Langue name = "Deutsch" filename = "german.xml">
|
||||||
<Menu>
|
<Menu>
|
||||||
<Main>
|
<Main>
|
||||||
<!-- Main Menu Titles -->
|
<!-- Main Menu Titles -->
|
||||||
@ -31,10 +31,10 @@
|
|||||||
<Item posX = "1" posY = "13" name = "&Kommentare"/>
|
<Item posX = "1" posY = "13" name = "&Kommentare"/>
|
||||||
<Item posX = "1" posY = "14" name = "Autovervollst&ändigung"/>
|
<Item posX = "1" posY = "14" name = "Autovervollst&ändigung"/>
|
||||||
<Item posX = "1" posY = "15" name = "Zeile&nende"/>
|
<Item posX = "1" posY = "15" name = "Zeile&nende"/>
|
||||||
<Item posX = "2" posY = "14" name = "Alle &Vorkommnisse hervorheben"/>
|
<Item posX = "2" posY = "16" name = "Alle &Vorkommnisse hervorheben"/>
|
||||||
<Item posX = "2" posY = "15" name = "Alle &Hervorhebungen löschen"/>
|
<Item posX = "2" posY = "17" name = "Alle &Hervorhebungen löschen"/>
|
||||||
<Item posX = "2" posY = "16" name = "Zu vorheriger Hervorhebung s&pringen"/>
|
<Item posX = "2" posY = "18" name = "Zu vorheriger Hervorhebung s&pringen"/>
|
||||||
<Item posX = "2" posY = "17" name = "Zu nächster Hervorhebung s&pringen"/>
|
<Item posX = "2" posY = "19" name = "Zu nächster Hervorhebung s&pringen"/>
|
||||||
<Item posX = "3" posY = "4" name = "Nicht &druckbare Zeichen"/>
|
<Item posX = "3" posY = "4" name = "Nicht &druckbare Zeichen"/>
|
||||||
<Item posX = "3" posY = "5" name = "Z&oom"/>
|
<Item posX = "3" posY = "5" name = "Z&oom"/>
|
||||||
<Item posX = "3" posY = "6" name = "Datei &verschieben/duplizieren"/>
|
<Item posX = "3" posY = "6" name = "Datei &verschieben/duplizieren"/>
|
||||||
@ -158,6 +158,8 @@
|
|||||||
<Item id = "43045" name = "Suchergebnis-&Fenster"/>
|
<Item id = "43045" name = "Suchergebnis-&Fenster"/>
|
||||||
<Item id = "43046" name = "Zu nächstem S&uchergebnis springen"/>
|
<Item id = "43046" name = "Zu nächstem S&uchergebnis springen"/>
|
||||||
<Item id = "43047" name = "Zu vorherigem S&uchergebnis springen"/>
|
<Item id = "43047" name = "Zu vorherigem S&uchergebnis springen"/>
|
||||||
|
<Item id = "43048" name = "Ausw&ählen und nächstes Vorkommnis suchen"/>
|
||||||
|
<Item id = "43049" name = "Ausw&ählen und vorheriges Vorkommnis suchen"/>
|
||||||
<Item id = "44009" name = "&Post-It"/>
|
<Item id = "44009" name = "&Post-It"/>
|
||||||
<Item id = "44010" name = "Alle Te&xtblöcke schließen"/>
|
<Item id = "44010" name = "Alle Te&xtblöcke schließen"/>
|
||||||
<Item id = "44011" name = "Benutzerdefinierte Spra&che ..."/>
|
<Item id = "44011" name = "Benutzerdefinierte Spra&che ..."/>
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -18,10 +18,10 @@
|
|||||||
; Define the application name
|
; Define the application name
|
||||||
!define APPNAME "Notepad++"
|
!define APPNAME "Notepad++"
|
||||||
|
|
||||||
!define APPVERSION "5.6.5"
|
!define APPVERSION "5.6.6"
|
||||||
!define APPNAMEANDVERSION "Notepad++ v5.6.5"
|
!define APPNAMEANDVERSION "Notepad++ v5.6.6"
|
||||||
!define VERSION_MAJOR 5
|
!define VERSION_MAJOR 5
|
||||||
!define VERSION_MINOR 65
|
!define VERSION_MINOR 66
|
||||||
|
|
||||||
!define APPWEBSITE "http://notepad-plus.sourceforge.net/"
|
!define APPWEBSITE "http://notepad-plus.sourceforge.net/"
|
||||||
|
|
||||||
@ -29,7 +29,7 @@
|
|||||||
Name "${APPNAMEANDVERSION}"
|
Name "${APPNAMEANDVERSION}"
|
||||||
InstallDir "$PROGRAMFILES\Notepad++"
|
InstallDir "$PROGRAMFILES\Notepad++"
|
||||||
InstallDirRegKey HKLM "Software\${APPNAME}" ""
|
InstallDirRegKey HKLM "Software\${APPNAME}" ""
|
||||||
OutFile ".\build\npp.5.6.5.Installer.exe"
|
OutFile ".\build\npp.5.6.6.Installer.exe"
|
||||||
|
|
||||||
; GetWindowsVersion
|
; GetWindowsVersion
|
||||||
;
|
;
|
||||||
@ -489,10 +489,6 @@ GLOBAL_INST:
|
|||||||
Exec 'regsvr32 /u /s "$INSTDIR\NppShell.dll"'
|
Exec 'regsvr32 /u /s "$INSTDIR\NppShell.dll"'
|
||||||
Delete "$INSTDIR\NppShell.dll"
|
Delete "$INSTDIR\NppShell.dll"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
; detect the right of
|
; detect the right of
|
||||||
UserInfo::GetAccountType
|
UserInfo::GetAccountType
|
||||||
@ -644,13 +640,13 @@ SubSection "Plugins" Plugins
|
|||||||
File "..\bin\plugins\doc\NPPTextFXdemo.TXT"
|
File "..\bin\plugins\doc\NPPTextFXdemo.TXT"
|
||||||
SectionEnd
|
SectionEnd
|
||||||
|
|
||||||
|
/* Work, but it's not used by many people
|
||||||
Section "NppNetNote" NppNetNote
|
Section "NppNetNote" NppNetNote
|
||||||
Delete "$INSTDIR\plugins\NppNetNote.dll"
|
Delete "$INSTDIR\plugins\NppNetNote.dll"
|
||||||
SetOutPath "$INSTDIR\plugins"
|
SetOutPath "$INSTDIR\plugins"
|
||||||
File "..\bin\plugins\NppNetNote.dll"
|
File "..\bin\plugins\NppNetNote.dll"
|
||||||
SectionEnd
|
SectionEnd
|
||||||
|
*/
|
||||||
|
|
||||||
Section "Spell-Checker" SpellChecker
|
Section "Spell-Checker" SpellChecker
|
||||||
Delete "$INSTDIR\plugins\SpellChecker.dll"
|
Delete "$INSTDIR\plugins\SpellChecker.dll"
|
||||||
@ -793,6 +789,7 @@ SubSection "Themes" Themes
|
|||||||
SubSectionEnd
|
SubSectionEnd
|
||||||
|
|
||||||
Section /o "As default html viewer" htmlViewer
|
Section /o "As default html viewer" htmlViewer
|
||||||
|
SetOverwrite on
|
||||||
SetOutPath "$INSTDIR\"
|
SetOutPath "$INSTDIR\"
|
||||||
File "..\bin\nppIExplorerShell.exe"
|
File "..\bin\nppIExplorerShell.exe"
|
||||||
WriteRegStr HKLM "SOFTWARE\Microsoft\Internet Explorer\View Source Editor\Editor Name" "" "$INSTDIR\nppIExplorerShell.exe"
|
WriteRegStr HKLM "SOFTWARE\Microsoft\Internet Explorer\View Source Editor\Editor Name" "" "$INSTDIR\nppIExplorerShell.exe"
|
||||||
@ -801,6 +798,7 @@ SectionEnd
|
|||||||
InstType "o"
|
InstType "o"
|
||||||
|
|
||||||
Section "Auto-Updater" AutoUpdater
|
Section "Auto-Updater" AutoUpdater
|
||||||
|
SetOverwrite on
|
||||||
SetOutPath "$INSTDIR\updater"
|
SetOutPath "$INSTDIR\updater"
|
||||||
File "..\bin\updater\GUP.exe"
|
File "..\bin\updater\GUP.exe"
|
||||||
File "..\bin\updater\libcurl.dll"
|
File "..\bin\updater\libcurl.dll"
|
||||||
@ -808,7 +806,6 @@ Section "Auto-Updater" AutoUpdater
|
|||||||
File "..\bin\updater\License.txt"
|
File "..\bin\updater\License.txt"
|
||||||
File "..\bin\updater\gpl.txt"
|
File "..\bin\updater\gpl.txt"
|
||||||
File "..\bin\updater\readme.txt"
|
File "..\bin\updater\readme.txt"
|
||||||
File "..\bin\updater\getDownLoadUrl.php"
|
|
||||||
SectionEnd
|
SectionEnd
|
||||||
|
|
||||||
;--------------------------------
|
;--------------------------------
|
||||||
|
@ -1742,7 +1742,9 @@ int ScintillaEditView::searchInTarget(const TCHAR * text2Find, int lenOfText2Fin
|
|||||||
WcharMbcsConvertor *wmc = WcharMbcsConvertor::getInstance();
|
WcharMbcsConvertor *wmc = WcharMbcsConvertor::getInstance();
|
||||||
unsigned int cp = execute(SCI_GETCODEPAGE);
|
unsigned int cp = execute(SCI_GETCODEPAGE);
|
||||||
const char *text2FindA = wmc->wchar2char(text2Find, cp);
|
const char *text2FindA = wmc->wchar2char(text2Find, cp);
|
||||||
int targetFound = execute(SCI_SEARCHINTARGET, (WPARAM)lenOfText2Find, (LPARAM)text2FindA);
|
size_t text2FindALen = strlen(text2FindA);
|
||||||
|
int len = (lenOfText2Find > (int)text2FindALen)?lenOfText2Find:text2FindALen;
|
||||||
|
int targetFound = execute(SCI_SEARCHINTARGET, (WPARAM)len, (LPARAM)text2FindA);
|
||||||
return targetFound;
|
return targetFound;
|
||||||
#else
|
#else
|
||||||
return execute(SCI_SEARCHINTARGET, (WPARAM)lenOfText2Find, (LPARAM)text2Find);
|
return execute(SCI_SEARCHINTARGET, (WPARAM)lenOfText2Find, (LPARAM)text2Find);
|
||||||
|
@ -18,12 +18,12 @@
|
|||||||
#ifndef RESOURCE_H
|
#ifndef RESOURCE_H
|
||||||
#define RESOURCE_H
|
#define RESOURCE_H
|
||||||
|
|
||||||
#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v5.6.5")
|
#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v5.6.6")
|
||||||
|
|
||||||
// should be X.Y : ie. if VERSION_DIGITALVALUE == 4, 7, 1, 0 , then X = 4, Y = 71
|
// 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")
|
// ex : #define VERSION_VALUE TEXT("5.63\0")
|
||||||
#define VERSION_VALUE TEXT("5.65\0")
|
#define VERSION_VALUE TEXT("5.66\0")
|
||||||
#define VERSION_DIGITALVALUE 5, 6, 5, 0
|
#define VERSION_DIGITALVALUE 5, 6, 6, 0
|
||||||
|
|
||||||
#ifdef UNICODE
|
#ifdef UNICODE
|
||||||
#define UNICODE_ANSI_MODE TEXT("(UNICODE)")
|
#define UNICODE_ANSI_MODE TEXT("(UNICODE)")
|
||||||
|
Loading…
Reference in New Issue
Block a user