Fix for cursor on line that disappears (from Kimmo, that I meant to check in earlier).

diff --git a/Src/MergeDoc.cpp b/Src/MergeDoc.cpp
index 72c220f..e28c8e7 100644 (file)
--- a/Src/MergeDoc.cpp
+++ b/Src/MergeDoc.cpp
@@ -595,6 +595,9 @@ void CMergeDoc::ListCopy(bool bSrcLeft)
                                if(pt.y>=cd_blank && pt.y<=cd_dend)
                                {
                                        pt.y = cd_blank-1;
+                                       // If removing first line, set X to 0^M
+                                       // Calculating line length is unneccessary work
+                                       pt.x = 0;
                                        active->SetCursorPos(pt);
                                }
                                dbuf.DeleteText(NULL, cd_blank-1, dbuf.GetLineLength(cd_blank-1), cd_dend, dbuf.GetLineLength(cd_dend), CE_ACTION_DELETE, FALSE);