From: Kimmo Varis <kimmov@gmail.com>
Date: Sun, 23 Mar 2003 12:29:21 +0000 (+0000)
Subject: PATCH: [ 707753 ] Delayed rescan - fix
X-Git-Tag: 2.16.5~8081
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=0334184de58e8ba1875432a90c9b2411a9b57d9d;p=winmerge-jp%2Fwinmerge-jp.git

PATCH: [ 707753 ] Delayed rescan - fix
---

diff --git a/Src/MergeEditView.cpp b/Src/MergeEditView.cpp
index 4dfabc043..4ac7482f8 100644
--- 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 97c687c02..a964192c2 100644
--- 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