Src/Languages/Swedish: MergeSwedish.rc
Add some const keywords and fix comments, remove unused function.
Src: DiffList.cpp DiffList.h
+ BUG: [ 1488797 ] ASSERT in CMergeEditView::OnPrevdiff
+ Fix from Mallato
+ Src: MergeEditView.cpp
2006-05-23 Tim
PATCH: [ 1493713 ] Translate 'Bookmarks' feature to German
if (curDiff < pd->m_diffList.GetSize() - 1)
{
nextDiff = pd->m_diffList.NextSignificantDiff(curDiff);
- if (nextDiff == -1)
- nextDiff = curDiff;
}
}
+ if (nextDiff == -1)
+ nextDiff = curDiff;
+
// nextDiff is the next one if there is one, else it is the one we're on
SelectDiff(nextDiff, TRUE, FALSE);
}
if (curDiff > 0)
{
prevDiff = pd->m_diffList.PrevSignificantDiff(curDiff);
- if (prevDiff == -1)
- prevDiff = curDiff;
}
}
+ if (prevDiff == -1)
+ prevDiff = curDiff;
+
// prevDiff is the preceding one if there is one, else it is the one we're on
SelectDiff(prevDiff, TRUE, FALSE);
}