[Winmerge-svn] SF.net SVN: winmerge:[6618] branches/R2_12
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
From: <ki...@us...> - 2009-03-30 20:07:41
|
Revision: 6618 http://winmerge.svn.sourceforge.net/winmerge/?rev=6618&view=rev Author: kimmov Date: 2009-03-30 20:07:18 +0000 (Mon, 30 Mar 2009) Log Message: ----------- PATCH: [ 2712120 ] patch for Bug#2622196 Submitted by Matthias Mayer Modified Paths: -------------- branches/R2_12/Docs/Users/ChangeLog.txt branches/R2_12/Src/DiffTextBuffer.cpp Modified: branches/R2_12/Docs/Users/ChangeLog.txt =================================================================== --- branches/R2_12/Docs/Users/ChangeLog.txt 2009-03-30 20:02:20 UTC (rev 6617) +++ branches/R2_12/Docs/Users/ChangeLog.txt 2009-03-30 20:07:18 UTC (rev 6618) @@ -10,6 +10,7 @@ bugfix: Swapping panes did not update statusbar (#2661838) Bugfix: Says files are identical after making files different in another application and re-loading them (#2672737) + Bugfix: Files with missing last EOL weren't merged correctly (#2712120) Translation updates: - Polish (#2717382) Modified: branches/R2_12/Src/DiffTextBuffer.cpp =================================================================== --- branches/R2_12/Src/DiffTextBuffer.cpp 2009-03-30 20:02:20 UTC (rev 6617) +++ branches/R2_12/Src/DiffTextBuffer.cpp 2009-03-30 20:07:18 UTC (rev 6618) @@ -211,7 +211,10 @@ { int cchText = GetFullLineLength(nLineIndex); if (cchText == 0) + { + strLine.Empty(); return FALSE; + } LPTSTR pchText = strLine.GetBufferSetLength(cchText); memcpy(pchText, GetLineChars(nLineIndex), cchText * sizeof(TCHAR)); return TRUE; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |