Use Change::isSimilarTo to find a change when merging changes.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33284 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Vincent van Ravesteijn 2010-01-31 00:21:52 +00:00
parent 76b4383571
commit b7ff36304d

View File

@ -405,14 +405,14 @@ bool findChange(BufferView * bv, bool next)
if (next) { if (next) {
for (; !tip.at_end(); tip.forwardPos()) { for (; !tip.at_end(); tip.forwardPos()) {
Change change = tip.paragraph().lookupChange(tip.pos()); Change change = tip.paragraph().lookupChange(tip.pos());
if (change != orig_change) if (!change.isSimilarTo(orig_change))
break; break;
} }
} else { } else {
for (; !tip.at_begin();) { for (; !tip.at_begin();) {
tip.backwardPos(); tip.backwardPos();
Change change = tip.paragraph().lookupChange(tip.pos()); Change change = tip.paragraph().lookupChange(tip.pos());
if (change != orig_change) { if (!change.isSimilarTo(orig_change)) {
// take a step forward to correctly set the selection // take a step forward to correctly set the selection
tip.forwardPos(); tip.forwardPos();
break; break;