Fix bug 5310: http://bugzilla.lyx.org/show_bug.cgi?id=5310

	* BufferView.cpp (dispatch): make sure to repaint the document after
	jumping to a new change.
	* lyxfind.cpp (findNextChange): do not ignore the last character when
	a change extends to the end of an inset.

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

diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index cea5b723c6d890a1c0e60e68bc9f1ec7bd906b31..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:

diff --git a/src/lyxfind.cpp b/src/lyxfind.cpp
index 0cfd2cf86861d80a20468cad3250419f90160c20..fbb515ba39991461de42b3b10b9e0b4acc15dda4 100644 (file)
--- a/src/lyxfind.cpp
+++ b/src/lyxfind.cpp
@@ -333,10 +333,6 @@ bool findNextChange(BufferView * bv)
                if (change != orig_change)
                        break;
        }
-       // avoid crash (assertion violation) if the imaginary end-of-par
-       // character of the last paragraph of the document is marked as changed
-       if (tip.at_end())
-               tip.backwardPos();
 
        // Now put cursor to end of selection:
        bv->cursor().setCursor(cur);