* src/text.C

	(bool LyXText::Delete):
	move cursor to next par after deleting a paragraph break
	in change tracking mode.

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

diff --git a/src/text.C b/src/text.C
index d19a3384937fc3abca90aadeecbba3e883a33ca0..dfe9a3f3043c4991750d694f9165e1d9e90a85bd 100644 (file)
--- a/src/text.C
+++ b/src/text.C
@@ -1579,17 +1579,21 @@ bool LyXText::Delete(LCursor & cur)
                recordUndo(cur, Undo::DELETE, cur.pit());
                setCursorIntern(cur, cur.pit(), cur.pos() + 1, false, cur.boundary());
                needsUpdate = backspace(cur);
-               Paragraph & par = cur.paragraph();
-               if (cur.pos() < par.size()
-                   && par.lookupChange(cur.pos()) == Change::DELETED)
+               if (cur.paragraph().lookupChange(cur.pos()) == Change::DELETED)
                        cur.posRight();
        } else if (cur.pit() != cur.lastpit()) {
                LCursor scur = cur;
 
-               setCursorIntern(cur, cur.pit()+1, 0, false, false);
+               setCursorIntern(cur, cur.pit() + 1, 0, false, false);
                if (pars_[cur.pit()].layout() == pars_[scur.pit()].layout()) {
                        recordUndo(scur, Undo::DELETE, scur.pit());
                        needsUpdate = backspace(cur);
+                       if (cur.buffer().params().tracking_changes) {
+                               // move forward after the paragraph break is DELETED
+                               Paragraph & par = cur.paragraph();
+                               if (par.lookupChange(par.size()) == Change::DELETED)
+                                       setCursorIntern(cur, cur.pit() + 1, 0);
+                               }
                } else {
                        setCursorIntern(scur, scur.pit(), scur.pos(), false, scur.boundary());
                }