OSDN Git Service

MergeDoc.cpp: 'Copy All To Left/right' did not work correctly when the source pane...
authorTakashi Sawanaka <sdottaka@users.sourceforge.net>
Sun, 31 Mar 2019 22:54:13 +0000 (07:54 +0900)
committerTakashi Sawanaka <sdottaka@users.sourceforge.net>
Sun, 31 Mar 2019 22:54:13 +0000 (07:54 +0900)
Src/MergeDoc.cpp

index 59f188c..7438cd5 100644 (file)
@@ -866,7 +866,7 @@ void CMergeDoc::CopyMultipleList(int srcPane, int dstPane, int firstDiff, int la
                        }                       
                        // Group merge with previous (merge undo data to one action)
                        bGroupWithPrevious = true;
-                       if (i > firstDiff)
+                       if (i > firstDiff || firstWordDiff <= 0)
                        {
                                if (!ListCopy(srcPane, dstPane, -1, bGroupWithPrevious, false))
                                        break; // sync failure