[Winmerge-svn] SF.net SVN: winmerge:[7137] trunk
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
From: <ki...@us...> - 2010-04-23 17:34:40
|
Revision: 7137 http://winmerge.svn.sourceforge.net/winmerge/?rev=7137&view=rev Author: kimmov Date: 2010-04-23 17:34:32 +0000 (Fri, 23 Apr 2010) Log Message: ----------- PATCH: [ 2991295 ] Diff Pane doesn't show diffs (moved blocks) Submitted by Matthias Mayer Fixes bug #2988656 Modified Paths: -------------- trunk/Docs/Users/ChangeLog.txt trunk/Src/MergeDiffDetailView.cpp trunk/Src/MergeEditView.cpp Modified: trunk/Docs/Users/ChangeLog.txt =================================================================== --- trunk/Docs/Users/ChangeLog.txt 2010-04-23 10:10:21 UTC (rev 7136) +++ trunk/Docs/Users/ChangeLog.txt 2010-04-23 17:34:32 UTC (rev 7137) @@ -7,6 +7,8 @@ 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) Modified: trunk/Src/MergeDiffDetailView.cpp =================================================================== --- trunk/Src/MergeDiffDetailView.cpp 2010-04-23 10:10:21 UTC (rev 7136) +++ trunk/Src/MergeDiffDetailView.cpp 2010-04-23 17:34:32 UTC (rev 7137) @@ -194,7 +194,7 @@ 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)) Modified: trunk/Src/MergeEditView.cpp =================================================================== --- trunk/Src/MergeEditView.cpp 2010-04-23 10:10:21 UTC (rev 7136) +++ trunk/Src/MergeEditView.cpp 2010-04-23 17:34:32 UTC (rev 7137) @@ -337,7 +337,7 @@ 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)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |