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 Dev_ONIGURUMA

Browse Source 
# Conflicts:
#	src/Notepad3.c
This commit is contained in:
Rainer Kottenhoff 2019-05-27 00:48:16 +02:00
commit 87ccc7356e
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Versions/build.txt
View File

@ -1 +1 @@
1729
1731

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

@ -3,7 +3,7 @@
<assemblyIdentity
name="Notepad3"
processorArchitecture="*"
version="5.19.526.1729"
version="5.19.527.1731"
type="win32"
/>
<description>Notepad3 ONIGURUMA</description>

5
src/Edit.c
View File

@ -6509,7 +6509,8 @@ void EditMarkAll(HWND hwnd, char* pszFind, int flags, DocPos rangeStart, DocPos
if (StrIsEmptyA(pszText))
{
if (SciCall_IsSelectionEmpty()) {
if (flags & SCFIND_WHOLEWORD) { // nothing selected, get word under caret if flagged
// nothing selected, get word under caret if flagged
if (Settings.MarkOccurrencesCurrentWord && (flags & SCFIND_WHOLEWORD)) {
DocPos const iCurrPos = SciCall_GetCurrentPos();
DocPos const iWordStart = SciCall_WordStartPosition(iCurrPos, true);
DocPos const iWordEnd = SciCall_WordEndPosition(iCurrPos, true);
@ -6542,7 +6543,7 @@ void EditMarkAll(HWND hwnd, char* pszFind, int flags, DocPos rangeStart, DocPos
if (StrChrIA(delims, pszText[iSelStart2])) {
return;
}
iSelStart2++;
++iSelStart2;
}
}
}

4
src/VersionEx.h
View File

@ -7,8 +7,8 @@
#define SAPPNAME "Notepad3"
#define VERSION_MAJOR 5
#define VERSION_MINOR 19
#define VERSION_REV 526
#define VERSION_BUILD 1729
#define VERSION_REV 527
#define VERSION_BUILD 1731
#define SCINTILLA_VER 415+
#define ONIGURUMA_REGEX_VER 6.9.2
#define VERSION_PATCH ONIGURUMA