PATCH: [ 707753 ] Delayed rescan - fix

diff --git a/Src/MergeEditView.cpp b/Src/MergeEditView.cpp
index 4dfabc0..4ac7482 100644 (file)
--- a/Src/MergeEditView.cpp
+++ b/Src/MergeEditView.cpp
@@ -642,9 +642,15 @@ void CMergeEditView::OnEditOperation(int nAction, LPCTSTR pszText)
        m_pTextBuffer->SetLineFlag(ptCursorPos.y, LF_WINMERGE_FLAGS, FALSE, FALSE, FALSE);
 
        // keep document up to date
-       // (Re)start timer to rescan
+       // (Re)start timer to rescan only when user edits text
        // If timer starting fails, rescan immediately
-       if (!SetTimer(IDT_RESCAN, RESCAN_TIMEOUT, NULL))
+       if (nAction == CE_ACTION_TYPING ||
+               nAction == CE_ACTION_BACKSPACE)
+       {
+               if (!SetTimer(IDT_RESCAN, RESCAN_TIMEOUT, NULL))
+                       pDoc->FlushAndRescan();
+       }
+       else
                pDoc->FlushAndRescan();
 }
 

diff --git a/Src/readme.txt b/Src/readme.txt
index 97c687c..a964192 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -1,3 +1,7 @@
+2003-03-23 Kimmo
+ PATCH: [ 707753 ] Delayed rescan - fix
+  WinMerge: MergeEditView.cpp
+
 2003-03-22 Kimmo
  PATCH: [ 707753 ] Delayed rescan
   WinMerge: MergeEditView.h MergeEditView.cpp