* text.C (erase): when deleting a text inset in change-tracking

	mode, make the cursor jump over it; avoid crash in setCursorIntern
	by using the right LyXText.

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

diff --git a/src/text.C b/src/text.C
index 7ca49fe69e88754bee75bb0fcdb28d7305d990fd..5442eba7a76c4494d033f34cbdea22a99c03689b 100644 (file)
--- a/src/text.C
+++ b/src/text.C
@@ -1657,7 +1657,7 @@ bool LyXText::erase(LCursor & cur)
                // FIXME: change tracking (MG)
                par.eraseChar(cur.pos(), cur.buffer().params().trackChanges);
                if (par.isDeleted(cur.pos()))
-                       cur.forwardPos();
+                       cur.forwardPosNoDescend();
                needsUpdate = true;
        } else if (cur.pit() != cur.lastpit()) {
                if (cur.buffer().params().trackChanges
@@ -1687,7 +1687,7 @@ bool LyXText::erase(LCursor & cur)
                        cur.updateFlags(Update::Force);
                // Make sure the cursor is correct. Is this really needed?
                // No, not really... at least not here!
-               setCursorIntern(cur, cur.pit(), cur.pos());
+               cur.text()->setCursorIntern(cur, cur.pit(), cur.pos());
        }
        
        return needsUpdate;