PATCH: [ 2991295 ] Diff Pane doesn't show diffs (moved blocks)

 Submitted by Matthias Mayer
 Fixes bug #2988656

diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt
index 5d537d7..eb01ee9 100644 (file)
--- 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 8b7c822..32db4aa 100644 (file)
--- 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 27e360a..3e65865 100644 (file)
--- 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))