[Winmerge-svn] SF.net SVN: winmerge:[6250] branches/R2_12
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
From: <ki...@us...> - 2008-12-27 10:35:55
|
Revision: 6250 http://winmerge.svn.sourceforge.net/winmerge/?rev=6250&view=rev Author: kimmov Date: 2008-12-27 10:35:52 +0000 (Sat, 27 Dec 2008) Log Message: ----------- PATCH: [ 2456399 ] Fix undo of one-line merge Submitted by Matthias Mayer Modified Paths: -------------- branches/R2_12/Docs/Users/ChangeLog.txt branches/R2_12/Src/editlib/ccrystaltextbuffer.cpp Modified: branches/R2_12/Docs/Users/ChangeLog.txt =================================================================== --- branches/R2_12/Docs/Users/ChangeLog.txt 2008-12-27 10:34:59 UTC (rev 6249) +++ branches/R2_12/Docs/Users/ChangeLog.txt 2008-12-27 10:35:52 UTC (rev 6250) @@ -10,6 +10,7 @@ (#2455595) BugFix: Quick compare didn't ignore EOL differences (#2433677) Bugfix: Remove EOL characters from command line (#2458728) + Bugfix: Merging one line diff to empty other side didn't work (#2456399) Translation updates: - Brazilian (#2461443) - Czech (r6201) Modified: branches/R2_12/Src/editlib/ccrystaltextbuffer.cpp =================================================================== --- branches/R2_12/Src/editlib/ccrystaltextbuffer.cpp 2008-12-27 10:34:59 UTC (rev 6249) +++ branches/R2_12/Src/editlib/ccrystaltextbuffer.cpp 2008-12-27 10:35:52 UTC (rev 6250) @@ -1298,14 +1298,16 @@ nAction = m_aUndoBuf[nPosition].m_nAction; // Advance to next undo group - nPosition++; - vector<UndoRecord>::const_iterator iter = m_aUndoBuf.begin () + nPosition; - while (iter != m_aUndoBuf.begin () && ((*iter).m_dwFlags & UNDO_BEGINGROUP) == 0) + if (m_aUndoBuf.size () > 1) { - --iter; - --nPosition; + nPosition++; + vector<UndoRecord>::const_iterator iter = m_aUndoBuf.begin () + nPosition; + while (iter != m_aUndoBuf.begin () && ((*iter).m_dwFlags & UNDO_BEGINGROUP) == 0) + { + --iter; + --nPosition; + } } - if (nPosition >= m_aUndoBuf.size ()) return NULL; // No more redo actions! This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |