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

+ fix: Onigmo RegEx Interface: bug in returning correct matching range

Browse Source
This commit is contained in:
Rainer Kottenhoff 2019-01-02 19:58:13 +01:00
parent ec743f791b
commit 9ae99e1d20
5 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Versions/build.txt
View File

@ -1 +1 @@
1437
1458

2
np3portableapp/_buildname.txt
View File

@ -1 +1 @@
"Dev_Test_2"
"RC2"

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

@ -3,8 +3,8 @@
<assemblyIdentity
name="Notepad3"
processorArchitecture="*"
version="5.18.1115.1437"
version="5.19.102.1458"
type="win32"
/>
<description>Notepad3 Dev_Test_2</description>
<description>Notepad3 RC2</description>
</assembly>

6
scionigmo/OnigmoRegExEngine.cxx
View File

@ -306,8 +306,10 @@ Sci::Position OnigmoRegExEngine::FindText(Document* doc, Sci::Position minPos, S
if ((result >= 0) && (rangeBegPtr <= rangeEndPtr))
{
m_MatchPos = SciPos(result); //SciPos(m_Region.beg[0]);
m_MatchLen = SciPos(m_Region.end[0] - result);
//~m_MatchPos = SciPos(result); //
m_MatchPos = SciPos(m_Region.beg[0]);
//~m_MatchLen = SciPos(m_Region.end[0] - result);
m_MatchLen = SciPos(m_Region.end[0] - m_Region.beg[0]);
}
//NOTE: potential 64-bit-size issue at interface here:

8
src/VersionEx.h
View File

@ -5,9 +5,9 @@
// //////////////////////////////////////////////////////////
#define APPNAME "Notepad3"
#define VERSION_MAJOR 5
#define VERSION_MINOR 18
#define VERSION_REV 1115
#define VERSION_BUILD 1437
#define VERSION_MINOR 19
#define VERSION_REV 102
#define VERSION_BUILD 1458
#define SCINTILLA_VER 412
#define ONIGMO_REGEX_VER 6.1.3
#define VERSION_PATCH "Dev_Test_2"
#define VERSION_PATCH "RC2"