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 Packages Projects Releases Wiki Activity

Merge pull request #3979 from RaiKoHoff/Dev_Master

Browse Source 
Fix Find-Pattern storage handling
This commit is contained in:
Rainer Kottenhoff 2022-02-17 20:24:48 +01:00 committed by GitHub
commit 9efb4d6da1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/Notepad3.c
View File

@ -1532,7 +1532,7 @@ static void SetFindReplaceData()
//
// SetCurrentSelAsFindReplaceData()
//
static bool SetCurrentSelAsFindReplaceData()
static bool SetCurrentSelAsFindReplaceData(LPEDITFINDREPLACE lpefr)
{
if (SciCall_IsSelectionEmpty()) {
EditSelectWordAtPos(SciCall_GetCurrentPos(), true);
@ -1544,8 +1544,13 @@ static bool SetCurrentSelAsFindReplaceData()
char* const szSelection = AllocMem((cchSelection + 1), HEAP_ZERO_MEMORY);
if (szSelection) {
SciCall_GetSelText(szSelection);
SetFindPatternMB(szSelection);
SetFindReplaceData(); // s_FindReplaceData
if (lpefr) {
StrgReset(lpefr->chFindPattern, GetFindPattern());
}
FreeMem(szSelection);
return true;
}
@ -5583,7 +5588,7 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
case IDM_EDIT_SELTONEXT:
if (IsFindPatternEmpty()) {
if (!SetCurrentSelAsFindReplaceData()) {
if (!SetCurrentSelAsFindReplaceData(&s_FindReplaceData)) {
break;
}
}
@ -5592,7 +5597,7 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
case IDM_EDIT_SELTOPREV:
if (IsFindPatternEmpty()) {
if (!SetCurrentSelAsFindReplaceData()) {
if (!SetCurrentSelAsFindReplaceData(&s_FindReplaceData)) {
break;
}
}
@ -5606,7 +5611,7 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
case CMD_FINDNEXTSEL:
case CMD_FINDPREVSEL:
case IDM_EDIT_SAVEFIND: {
if (SetCurrentSelAsFindReplaceData()) {
if (SetCurrentSelAsFindReplaceData(&s_FindReplaceData)) {
MRU_Add(Globals.pMRUfind, GetFindPattern(), 0, -1, -1, NULL);
s_FindReplaceData.fuFlags &= (~(SCFIND_REGEXP | SCFIND_POSIX));
s_FindReplaceData.bTransformBS = false;
@ -5617,11 +5622,11 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
break;
case CMD_FINDNEXTSEL:
EditFindNext(Globals.hwndEdit, &s_FindReplaceData, false, false, true);
EditFindNext(Globals.hwndEdit, &s_FindReplaceData, false, false, false);
break;
case CMD_FINDPREVSEL:
EditFindPrev(Globals.hwndEdit, &s_FindReplaceData, false, false, true);
EditFindPrev(Globals.hwndEdit, &s_FindReplaceData, false, false, false);
break;
}
}