[ 765926 ] Merge empty last line to the last diffrange (change)

diff --git a/Src/MergeDoc.cpp b/Src/MergeDoc.cpp
index 0947649..6a9c850 100644 (file)
--- a/Src/MergeDoc.cpp
+++ b/Src/MergeDoc.cpp
@@ -499,24 +499,49 @@ void CMergeDoc::FixLastDiffRange(BOOL left)
 {
        DIFFRANGE dr = {0};
        int count = m_diffs.GetSize();
-       dr = m_diffs.GetAt(count - 1);
-
-       if (left)
+       if (count > 0)
        {
-               if (dr.op == OP_RIGHTONLY)
-                       dr.op = OP_DIFF;
-               dr.end0++;
+               dr = m_diffs.GetAt(count - 1);
+
+               if (left)
+               {
+                       if (dr.op == OP_RIGHTONLY)
+                               dr.op = OP_DIFF;
+                       dr.end0++;
+               }
+               else
+               {
+                       if (dr.op == OP_LEFTONLY)
+                               dr.op = OP_DIFF;
+                       dr.end1++;
+               }
+
+               m_diffs.SetAt(count - 1, dr); 
        }
-       else
+       else 
        {
-               if (dr.op == OP_LEFTONLY)
-                       dr.op = OP_DIFF;
-               dr.end1++;
-       }
+               // we have to create the DIFF
+               dr.end0   = m_ltBuf.GetLineCount() - 1;
+               dr.end1   = m_rtBuf.GetLineCount() - 1;
+               if (left)
+               {
+                       dr.begin0 = dr.end0;
+                       dr.begin1 = dr.end1 + 1;
+                       dr.op = OP_LEFTONLY;
+               }
+               else
+               {
+                       dr.begin0 = dr.end0 + 1;
+                       dr.begin1 = dr.end1;
+                       dr.op = OP_RIGHTONLY;
+               }
+               ASSERT(dr.begin0 == dr.begin1);
 
-       m_diffs.SetAt(count - 1, dr); 
+               AddDiffRange (dr.begin0, dr.end0, dr.begin1, dr.end1, dr.op); 
+       }
 }
 
+
 void CMergeDoc::ShowRescanError(int nRescanResult)
 {
        CString s;

diff --git a/Src/readme.txt b/Src/readme.txt
index 1f1c9e8..69ec828 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -1,4 +1,9 @@
 2003-07-16 Laoran
+ PATCH: [ 765926 ] Merge empty last line to the last diffrange (change)
+ new version
+  WinMerge: MergeDoc.cpp
+
+2003-07-16 Laoran
  PATCH: [ 771525 ] Updating cursor in ListCopy
   WinMerge: MergeDoc.cpp MergeDoc.h
   editlib: ccrystaltextbuffer.cpp ccrystaltextbuffer.h