mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-22 05:16:21 +00:00
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
This commit is contained in:
parent
f99d998cb7
commit
754ead5010
@ -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:
|
||||
|
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user