* src/text.C: fix dissolve-inset when pressing

	erase at the end of the inset

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

diff --git a/src/text.C b/src/text.C
index 2cebea4251bc66358c56239110cdd92eb0404450..09a490fc40f473d51552ec19f0e36a43a6342be5 100644 (file)
--- a/src/text.C
+++ b/src/text.C
@@ -1668,7 +1668,10 @@ bool LyXText::erase(LCursor & cur)
                if (par.isDeleted(cur.pos()))
                        cur.forwardPosNoDescend();
                needsUpdate = true;
-       } else if (cur.pit() != cur.lastpit()) {
+       } else {
+               if (cur.pit() == cur.lastpit())
+                       return dissolveInset(cur);
+
                if (!par.isMergedOnEndOfParDeletion(cur.buffer().params().trackChanges)) {
                        par.setChange(cur.pos(), Change(Change::DELETED));
                        cur.forwardPos();
@@ -1677,8 +1680,6 @@ bool LyXText::erase(LCursor & cur)
                        setCursorIntern(cur, cur.pit() + 1, 0);
                        needsUpdate = backspacePos0(cur);
                }
-       } else {
-               needsUpdate = dissolveInset(cur);
        }
 
        // FIXME: Inserting characters has nothing to do with setting a cursor.