CodeCow/Notepad3
1
0
Fork 0
mirror of https://github.com/rizonesoft/Notepad3.git synced 2026-06-14 21:09:05 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'notepad3_orig_rizone/master' into NewFeatures_grepWinNP3

Browse Source 
# Conflicts:
#	Versions/build.txt
This commit is contained in:
Rainer Kottenhoff 2020-03-28 09:55:58 +01:00
commit 477e9e94ba
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
res/Notepad3.exe.manifest.conf
View File

@ -3,7 +3,7 @@
<assemblyIdentity
name="Notepad3"
processorArchitecture="*"
version="5.20.328.1"
version="5.20.328.2"
type="win32"
/>
<description>Notepad3 RC3</description>

5
src/Edit.c
View File

@ -4693,7 +4693,8 @@ static int _wcsicoll_s(const wchar_t* s1, const wchar_t* s2) { return wcsicoll_s
// ----------------------------------------------------------------------------
int CmpStdLogical(const void *s1, const void *s2) {
if (s1 && s2) {
if (StrIsNotEmpty(s1) && StrIsNotEmpty(s2))
{
int cmp = StrCmpLogicalW(((SORTLINE*)s1)->pwszSortEntry, ((SORTLINE*)s2)->pwszSortEntry);
if (cmp == 0) {
cmp = StrCmpLogicalW(((SORTLINE*)s1)->pwszLine, ((SORTLINE*)s2)->pwszLine);
@ -4701,7 +4702,7 @@ int CmpStdLogical(const void *s1, const void *s2) {
return (cmp) ? cmp : CmpStd(s1, s2);
}
else {
return (s1 ? 1 : (s2 ? -1 : 0));
return (StrIsNotEmpty(s1) ? 1 : (StrIsNotEmpty(s2) ? -1 : 0));
}
}

2
src/VersionEx.h
View File

@ -9,7 +9,7 @@
#define VERSION_MAJOR 5
#define VERSION_MINOR 20
#define VERSION_REV 328
#define VERSION_BUILD 1
#define VERSION_BUILD 2
#define SCINTILLA_VER 432
#define ONIGURUMA_REGEX_VER 6.9.4
#define UCHARDET_VER 2018.09.27