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 2d5d44c6fb4fc68ccf51a88b71238e772925a0a6..ca2f15d089c1f413c6eee1177eff9e772363fc83 100644 (file)
--- 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 816981e2a333784e462abaa6a21225a3d112e529..5c28e86895a1ba3e760f56fd74de321127c31425 100644 (file)
--- 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 c66570c08b9097ba735834907c152f62fe261ae9..6159a539d120b0576e3ee871f66881ee201e8b23 100644 (file)
--- 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 136d9529c21eea440156d172cf9f50b37cce6f1a..7605b0cfd9465fa57c6cea5de95ab6cd45130c77 100644 (file)
--- 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: