From e2b7962b682af831eac0b61aa14f2af97f179e97 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Fri, 23 Apr 2010 17:34:32 +0000 Subject: [PATCH] PATCH: [ 2991295 ] Diff Pane doesn't show diffs (moved blocks) Submitted by Matthias Mayer Fixes bug #2988656 --- Docs/Users/ChangeLog.txt | 2 ++ Src/MergeDiffDetailView.cpp | 2 +- Src/MergeEditView.cpp | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index 5d537d75d..eb01ee974 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -7,6 +7,8 @@ WinMerge 2.13.12 Update copyright year to 2010 Fix help locations (#2988974) Bugfix: Strange scrolling effect in location pane (#2942869) + Bugfix: Difference panel didn't show differences when moved blocks were + enabled (#2988656) Translation updates: - Chinese Traditional (#2954833) - French (#2968200) diff --git a/Src/MergeDiffDetailView.cpp b/Src/MergeDiffDetailView.cpp index 8b7c822bc..32db4aacf 100644 --- a/Src/MergeDiffDetailView.cpp +++ b/Src/MergeDiffDetailView.cpp @@ -194,7 +194,7 @@ int CMergeDiffDetailView::GetAdditionalTextBlocks (int nLineIndex, TEXTBLOCK *pB return 0; DWORD dwLineFlags = GetLineFlags(nLineIndex); - if ((dwLineFlags & LF_DIFF) != LF_DIFF || (dwLineFlags & LF_MOVED) == LF_MOVED) + if ((dwLineFlags & LF_DIFF) != LF_DIFF) return 0; // No diff if (!GetOptionsMgr()->GetBool(OPT_WORDDIFF_HIGHLIGHT)) diff --git a/Src/MergeEditView.cpp b/Src/MergeEditView.cpp index 27e360a75..3e65865f9 100644 --- a/Src/MergeEditView.cpp +++ b/Src/MergeEditView.cpp @@ -337,7 +337,7 @@ void CMergeEditView::OnActivateView(BOOL bActivate, CView* pActivateView, CView* int CMergeEditView::GetAdditionalTextBlocks (int nLineIndex, TEXTBLOCK *pBuf) { DWORD dwLineFlags = GetLineFlags(nLineIndex); - if ((dwLineFlags & LF_DIFF) != LF_DIFF || (dwLineFlags & LF_MOVED) == LF_MOVED) + if ((dwLineFlags & LF_DIFF) != LF_DIFF) return 0; if (!GetOptionsMgr()->GetBool(OPT_WORDDIFF_HIGHLIGHT)) -- 2.11.0