[Winmerge-svn] SF.net SVN: winmerge: [3897] trunk/Src

[<ga...@us...>]

Revision: 3897
          http://svn.sourceforge.net/winmerge/?rev=3897&view=rev
Author:   galh
Date:     2006-12-03 22:39:34 -0800 (Sun, 03 Dec 2006)

Log Message:
-----------
PATCH: [ 1597814 ] 'Wrap Lines' + 'Next Diff' Bug (2)

Modified Paths:
--------------
    trunk/Src/Changes.txt
    trunk/Src/MergeEditView.cpp

Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt	2006-12-03 11:31:26 UTC (rev 3896)
+++ trunk/Src/Changes.txt	2006-12-04 06:39:34 UTC (rev 3897)
@@ -2,6 +2,10 @@
 Add new items to top.
 (This summarizes all changes to all files under Src, including Src\Languages.)
 
+2006-12-04 Gal
+ PATCH: [ 1597814 ] 'Wrap Lines' + 'Next Diff' Bug (2)
+  Src: MergeEditView.cpp
+
 2006-12-03 Kimmo
  PATCH: [ 1556688 ] Fix maketstring to check for zero-term by MultiByteToWideCha
   Src: Common/unicoder.cpp

Modified: trunk/Src/MergeEditView.cpp
===================================================================
--- trunk/Src/MergeEditView.cpp	2006-12-03 11:31:26 UTC (rev 3896)
+++ trunk/Src/MergeEditView.cpp	2006-12-04 06:39:34 UTC (rev 3897)
@@ -1474,7 +1474,7 @@
 			// if diff last line outside current view - context OR
 			// if diff is bigger than screen
 			// if diff is bigger than screen when word wrap enabled
-			if ((nDiffStart < m_nTopSubLine + CONTEXT_LINES_ABOVE) ||
+			if ((nDiffStart < m_nTopSubLine) ||
 				(nDiffEnd >= m_nTopSubLine + GetScreenLines() - CONTEXT_LINES_BELOW) ||
 				(nDiffEnd - nDiffStart) >= GetScreenLines() ||
 				(nDiffStart + GetSubLines(ptStart.y)) >= GetScreenLines())


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.