revert recent change to development/FORMAT (don't change history)

[lyx.git] / src / lyxfind.C

diff --git a/src/lyxfind.C b/src/lyxfind.C
index 6d6b75ddf01f7763683408092284c031d216eb70..14feb353e5518d7aac4cee337c8795c7df6ae242 100644 (file)
--- a/src/lyxfind.C
+++ b/src/lyxfind.C
@@ -128,7 +128,7 @@ bool findBackwards(DocIterator & cur, MatchString const & match)
 bool findChange(DocIterator & cur)
 {
        for (; cur; cur.forwardPos())
-               if (cur.inTexted() && cur.paragraph().lookupChange(cur.pos())
+               if (cur.inTexted() && cur.paragraph().lookupChange(cur.pos()).type
                    != Change::UNCHANGED)
                        return true;
        return false;
@@ -226,9 +226,7 @@ int replace(BufferView * bv, string const & searchstr,
                return 0;
 
        LCursor & cur = bv->cursor();
-       lyx::cap::replaceSelectionWithString(cur, replacestr);
-       lyx::cap::setSelectionRange(cur, replacestr.length());
-       cur.top() = fw ? cur.selEnd() : cur.selBegin();
+       lyx::cap::replaceSelectionWithString(cur, replacestr, fw);
        bv->buffer()->markDirty();
        find(bv, searchstr, cs, mw, fw);
        bv->update();
@@ -274,7 +272,7 @@ void find(BufferView * bv, FuncRequest const & ev)
        if (!bv || ev.action != LFUN_WORD_FIND)
                return;
 
-       lyxerr << "find called, cmd: " << ev << std::endl;
+       //lyxerr << "find called, cmd: " << ev << std::endl;
 
        // data is of the form
        // "<search>
@@ -346,11 +344,11 @@ bool findNextChange(BufferView * bv)
        bv->cursor().setCursor(cur);
        bv->cursor().resetAnchor();
 
-       Change orig_change = cur.paragraph().lookupChangeFull(cur.pos());
+       Change orig_change = cur.paragraph().lookupChange(cur.pos());
 
        DocIterator et = doc_iterator_end(cur.inset());
        for (; cur != et; cur.forwardPosNoDescend()) {
-               Change change = cur.paragraph().lookupChangeFull(cur.pos());
+               Change change = cur.paragraph().lookupChange(cur.pos());
                if (change != orig_change) {
                        break;
                }