SConstruct: don't build anymore TOC.lyx files

[lyx.git] / src / BufferView.cpp

diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index 054fadbbabab473aa0f3fbe0db7aca753e1b8f13..02d8fcdc98339f68903a4c0c9fe1451506f3b759 100644 (file)
--- a/src/BufferView.cpp
+++ b/src/BufferView.cpp
@@ -1154,11 +1154,15 @@ bool BufferView::dispatch(FuncRequest const & cmd)
 
        case LFUN_CHANGE_NEXT:
                findNextChange(this);
+               // FIXME: Move this LFUN to Buffer so that we don't have to do this:
+               processUpdateFlags(Update::Force | Update::FitCursor);
                break;
 
        case LFUN_CHANGES_MERGE:
-               if (findNextChange(this))
+               if (findNextChange(this)) {
+                       processUpdateFlags(Update::Force | Update::FitCursor);
                        showDialog("changes");
+               }
                break;
 
        case LFUN_ALL_CHANGES_ACCEPT:
@@ -1188,6 +1192,10 @@ bool BufferView::dispatch(FuncRequest const & cmd)
                FuncRequest req = cmd;
                if (cmd.argument().empty() && !d->search_request_cache_.argument().empty())
                        req = d->search_request_cache_;
+               if (req.argument().empty()) {
+                       theLyXFunc().dispatch(FuncRequest(LFUN_DIALOG_SHOW, "findreplace"));
+                       break;
+               }
                if (find(this, req))
                        showCursor();
                else
@@ -1744,9 +1752,8 @@ bool BufferView::setCursorFromInset(Inset const * inset)
        // Inset is not at cursor position. Find it in the document.
        Cursor cur(*this);
        cur.reset(buffer().inset());
-       do 
+       while (cur && cur.nextInset() != inset)
                cur.forwardInset();
-       while (cur && cur.nextInset() != inset);
 
        if (cur) {
                setCursor(cur);