[Winmerge-svn] SF.net SVN: winmerge: [4224] trunk/Src
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
From: <ki...@us...> - 2007-04-02 20:29:52
|
Revision: 4224 http://svn.sourceforge.net/winmerge/?rev=4224&view=rev Author: kimmov Date: 2007-04-02 13:29:50 -0700 (Mon, 02 Apr 2007) Log Message: ----------- PATCH: [ 1693041 ] Fix couple of editor bugs - Submitted by Jeremy Dewey Modified Paths: -------------- trunk/Src/Changes.txt trunk/Src/editlib/ccrystaleditview.cpp trunk/Src/editlib/ccrystaltextbuffer.cpp Modified: trunk/Src/Changes.txt =================================================================== --- trunk/Src/Changes.txt 2007-04-02 04:28:47 UTC (rev 4223) +++ trunk/Src/Changes.txt 2007-04-02 20:29:50 UTC (rev 4224) @@ -5,6 +5,9 @@ 2007-04-02 Kimmo RFE: [ 1685190 ] Add 1 pixel margin to line numbers area Src/editlib: ccrystaltextview.cpp + PATCH: [ 1693041 ] Fix couple of editor bugs + Submitted by Jeremy Dewey + editlib: ccrystaleditview.cpp ccrystaltextbuffer.cpp 2007-04-01 Tim PATCH: [ 1692033 ] Use SetResourceVersions.wsf with 3 version numbers Modified: trunk/Src/editlib/ccrystaleditview.cpp =================================================================== --- trunk/Src/editlib/ccrystaleditview.cpp 2007-04-02 04:28:47 UTC (rev 4223) +++ trunk/Src/editlib/ccrystaleditview.cpp 2007-04-02 20:29:50 UTC (rev 4224) @@ -121,6 +121,7 @@ m_bAutoIndent = TRUE; m_mapExpand = new CMap<CString, LPCTSTR, CString, LPCTSTR> (10); m_bMergeUndo = false; + m_bDisableBSAtSOL = FALSE; } CCrystalEditView:: ~CCrystalEditView () Modified: trunk/Src/editlib/ccrystaltextbuffer.cpp =================================================================== --- trunk/Src/editlib/ccrystaltextbuffer.cpp 2007-04-02 04:28:47 UTC (rev 4223) +++ trunk/Src/editlib/ccrystaltextbuffer.cpp 2007-04-02 20:29:50 UTC (rev 4224) @@ -1737,7 +1737,7 @@ paSavedRevisonNumbers->SetSize(nEndLine - nStartLine + 1); int i; for (i = 0; i < nEndLine - nStartLine + 1; i++) - (*paSavedRevisonNumbers)[i] = m_aLines[i].m_dwRevisionNumber; + (*paSavedRevisonNumbers)[i] = m_aLines[nStartLine + i].m_dwRevisionNumber; if (!InternalDeleteText (pSource, nStartLine, nStartChar, nEndLine, nEndChar)) { @@ -1763,7 +1763,7 @@ bGroupFlag = TRUE; } - AddUndoRecord (FALSE, CPoint (nStartChar, nStartLine), CPoint (0, -1), + AddUndoRecord (FALSE, CPoint (nStartChar, nStartLine), CPoint (nEndChar, nEndLine), sTextToDelete, nAction, paSavedRevisonNumbers); if (bGroupFlag) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |