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 pull request #1230 from RaiKoHoff/Dev_RC

Browse Source 
Fix "mark occurrences of current word"
This commit is contained in:
Rainer Kottenhoff 2019-05-22 10:29:19 +02:00 committed by GitHub
commit 15a3b5bca0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Versions/build.txt
View File

@ -1 +1 @@
1717
1718

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

@ -3,7 +3,7 @@
<assemblyIdentity
name="Notepad3"
processorArchitecture="*"
version="5.19.521.1717"
version="5.19.522.1718"
type="win32"
/>
<description>Notepad3 RC</description>

2
scionigmo/OnigmoRegExEngine.cxx
View File

@ -789,7 +789,7 @@ extern "C"
#ifdef SCINTILLA_DLL
__declspec(dllexport)
#endif
ptrdiff_t OnigmoRegExFind(const char* pchPattern, const char* pchText, const bool caseSensitive)
ptrdiff_t WINAPI OnigmoRegExFind(const char* pchPattern, const char* pchText, const bool caseSensitive)
{
const UChar* pattern = reinterpret_cast<const UChar*>(pchPattern);
const UChar* string = reinterpret_cast<const UChar*>(pchText);

2
src/Edit.c
View File

@ -6528,7 +6528,7 @@ void EditMarkAll(HWND hwnd, char* pszFind, int flags, DocPos rangeStart, DocPos
DocPos const iWordStart = SciCall_WordStartPosition(iCurrPos, true);
DocPos const iWordEnd = SciCall_WordEndPosition(iCurrPos, true);
iFindLength = (iWordEnd - iWordStart);
StringCchCopyNA(pszText, HUGE_BUFFER, SciCall_GetRangePointer(iWordStart, iFindLength), iFindLength);
StringCchCopyNA(txtBuffer, COUNTOF(txtBuffer), SciCall_GetRangePointer(iWordStart, iFindLength), iFindLength);
}
else {
return; // no selection and no word mark chosen

4
src/Notepad3.c
View File

@ -6627,7 +6627,7 @@ LRESULT MsgNotify(HWND hwnd, WPARAM wParam, LPARAM lParam)
// clear marks only, if selection changed
if (iUpd & SC_UPDATE_SELECTION)
{
if (!SciCall_IsSelectionEmpty()) {
if (!SciCall_IsSelectionEmpty() || Settings.MarkOccurrencesCurrentWord) {
MarkAllOccurrences(Settings2.UpdateDelayMarkAllOccurrences, true);
}
else {
@ -6637,8 +6637,8 @@ LRESULT MsgNotify(HWND hwnd, WPARAM wParam, LPARAM lParam)
else if (iUpd & SC_UPDATE_CONTENT) {
// ignoring SC_UPDATE_CONTENT cause Style and Marker are out of scope here
// using WM_COMMAND -> SCEN_CHANGE instead!
//~~~UpdateVisibleUrlIndics();
//~~~MarkAllOccurrences(Settings2.UpdateDelayMarkAllCoccurrences, false);
//~~~UpdateVisibleUrlIndics();
}
}
UpdateToolbar();

4
src/Version.h
View File

@ -67,7 +67,9 @@
#if defined(_MSC_VER)
#if (_MSC_VER >= 1920)
#if(_MSC_FULL_VER >= 192027508)
#if(_MSC_FULL_VER >= 192127702)
#define VER_CPL MS Visual C++ 2019 v16.1.0
#elif(_MSC_FULL_VER >= 192027508)
#define VER_CPL MS Visual C++ 2019 v16.0.(0-4)
#elif(_MSC_FULL_VER >= 192027027)
#define VER_CPL MS Visual C++ 2019 v16.0.Prev(1-4)

4
src/VersionEx.h
View File

@ -7,8 +7,8 @@
#define SAPPNAME "Notepad3"
#define VERSION_MAJOR 5
#define VERSION_MINOR 19
#define VERSION_REV 521
#define VERSION_BUILD 1717
#define VERSION_REV 522
#define VERSION_BUILD 1718
#define SCINTILLA_VER 415+
#define ONIGMO_REGEX_VER 6.2.0
#define VERSION_PATCH RC