From deb69eb34295e31b96aff10013031e2306baa211 Mon Sep 17 00:00:00 2001
From: Rainer Kottenhoff <rainer.kottenhoff@gmail.com>
Date: Sat, 25 May 2019 22:30:07 +0200
Subject: [PATCH] + fix: small bugfixes

---
 src/Edit.c     |  2 +-
 src/Notepad3.c | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/Edit.c b/src/Edit.c
index 107b8b464..e826ba3a0 100644
--- a/src/Edit.c
+++ b/src/Edit.c
@@ -5365,8 +5365,8 @@ static INT_PTR CALLBACK EditFindReplaceDlgProcW(HWND hwnd,UINT umsg,WPARAM wPara
           bool const bEnableReplInSel = !(SciCall_IsSelectionEmpty() || Sci_IsMultiOrRectangleSelection());
           DialogEnableWindow(hwnd, IDC_REPLACEINSEL, bEnableReplInSel);
 
+          _DelayMarkAll(hwnd, 50, s_InitialSearchStart);
 
-          _DelayMarkAll(hwnd, 0, s_InitialSearchStart);
           break;
 
         default:
diff --git a/src/Notepad3.c b/src/Notepad3.c
index 6c4bd7660..5b45f7387 100644
--- a/src/Notepad3.c
+++ b/src/Notepad3.c
@@ -9804,6 +9804,19 @@ void RestoreAction(int token, DoAction doAct)
             }
             ++i;
           }
+#else
+          SciCall_SetIndicatorCurrent(INDIC_NP3_MARK_OCCURANCE);
+          int const selCount = utarray_len(pSel->anchorPos_undo);
+          pPosAnchor = NULL;
+          pPosCur = NULL;
+          int i = 0;
+          while (i < selCount)
+          {
+            pPosAnchor = (DocPos*)((UNDO == doAct) ? utarray_next(pSel->anchorPos_undo, pPosAnchor) : utarray_next(pSel->anchorPos_redo, pPosAnchor));
+            pPosCur = (DocPos*)((UNDO == doAct) ? utarray_next(pSel->curPos_undo, pPosCur) : utarray_next(pSel->curPos_redo, pPosCur));
+            PostMessage(hwndedit, SCI_INDICATORFILLRANGE, (WPARAM)(*pPosAnchor), (LPARAM)(*pPosCur - *pPosAnchor));
+            ++i;
+          }
 #endif
         }
         break;