From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Mon, 3 Oct 2005 12:22:19 +0000 (+0000)
Subject: fix bug 2057: Delete key acting unexpectedly in MathEd
X-Git-Tag: 1.6.10~13864
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=609e7ae48853d34262d188da725bd3c55e821024;p=features.git

fix bug 2057: Delete key acting unexpectedly in MathEd


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

diff --git a/src/ChangeLog b/src/ChangeLog
index 2d5d44c6fb..ca2f15d089 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,6 +2,11 @@
 
 	* text.C (cursorX): two fixes involving RtL text drawing
 
+2005-10-03  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+	* cursor.C (erase): fix 'clever' UI hack. It was activated for all
+	items, not only large ones (part of bug 2057)
+
 2005-10-03  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
 	* text3.C (dispatch): when invoking LFUN_MATH_MACRO with no type
diff --git a/src/cursor.C b/src/cursor.C
index 816981e2a3..5c28e86895 100644
--- a/src/cursor.C
+++ b/src/cursor.C
@@ -782,7 +782,7 @@ bool LCursor::erase()
 	}
 
 	// 'clever' UI hack: only erase large items if previously slected
-	if (pos() != lastpos() && inset().nargs() > 0) {
+	if (pos() != lastpos() && nextAtom()->nargs() > 0) {
 		resetAnchor();
 		selection() = true;
 		++pos();
diff --git a/src/mathed/ChangeLog b/src/mathed/ChangeLog
index c66570c08b..6159a539d1 100644
--- a/src/mathed/ChangeLog
+++ b/src/mathed/ChangeLog
@@ -1,15 +1,21 @@
+2005-09-30  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+	* math_nestinset.C (doDispatch): do not leave the inset after
+	LFUN_DELETE. (part of bug 2057)
+
 2005-10-02  Georg Baum  <Georg.Baum@post.rwth-aachen.de>
 
 	* math_kerninset.C (write): write width, not 0 (fixes bug 2050)
 
 2005-10-03  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
 
-	* math_nestinset.C (doDispatch): use recordUndoInset when deleting whole
-	cell via LFUN_BACKSPACE (fixes bug 2058).
+	* math_nestinset.C (doDispatch): use recordUndoInset when deleting
+	whole cell via LFUN_BACKSPACE (fixes bug 2058).
 
 2005-09-27  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
 
-	* math_nestinset.C (doDispatch): leave inset to the right when hitting ESC.
+	* math_nestinset.C (doDispatch): leave inset to the right when
+	hitting ESC.
 
 2005-09-27  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
 
diff --git a/src/mathed/math_nestinset.C b/src/mathed/math_nestinset.C
index 136d9529c2..7605b0cfd9 100644
--- a/src/mathed/math_nestinset.C
+++ b/src/mathed/math_nestinset.C
@@ -626,8 +626,6 @@ void MathNestInset::doDispatch(LCursor & cur, FuncRequest & cmd)
 	case LFUN_DELETE:
 		recordUndo(cur);
 		cur.erase();
-		cmd = FuncRequest(LFUN_FINISHED_LEFT);
-		cur.undispatched();
 		break;
 
 	case LFUN_ESCAPE: