Fix the bug that when pressing the merge button while in the middle of a change,...

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29250 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/lyxfind.cpp b/src/lyxfind.cpp
index 6fa6aade1f459be41411005c503239b5bd763104..278f81c26266bfd9754de36235590462b1e4338e 100644 (file)
--- a/src/lyxfind.cpp
+++ b/src/lyxfind.cpp
@@ -360,6 +360,20 @@ bool findChange(BufferView * bv, bool next)
        }
 
        DocIterator cur = bv->cursor();
+       
+       // Are we within a change ? Then first search forward (backward), 
+       // clear the selection and search the other way around (see the end
+       // of this function). This will avoid changes to be selected half.
+       bool search_both_sides = false;
+       if (cur.pos() > 1) {
+               Change change_next_pos  
+                       = cur.paragraph().lookupChange(cur.pos());
+               Change change_prev_pos 
+                       = cur.paragraph().lookupChange(cur.pos() - 1);
+               if (change_next_pos.isSimilarTo(change_prev_pos))
+                       search_both_sides = true;
+       }
+
        if (!findChange(cur, next))
                return false;
 
@@ -394,6 +408,11 @@ bool findChange(BufferView * bv, bool next)
        bv->cursor().setCursor(cur);
        bv->cursor().setSelection();
 
+       if (search_both_sides) {
+               bv->cursor().setSelection(false);
+               findChange(bv, !next);
+       }
+
        return true;
 }