From: Michael Schmitt <michael.schmitt@teststep.org>
Date: Sun, 26 Nov 2006 00:04:25 +0000 (+0000)
Subject: 	* src/text.C: fix dissolve-inset when pressing
X-Git-Tag: 1.6.10~11761
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=7913b8c652773e112bc147a76c1a6ba7f969c7e8;hp=d4ba38a59ca6b4520978bb0579684c030c594a4c;p=lyx.git

	* 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 2cebea4251..09a490fc40 100644
--- 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.