Revert "Allow to undo partly math autocorrect"

This reverts commit f7a11ca7115064710b98bedc64d724ca15362527.

diff --git a/src/Cursor.cpp b/src/Cursor.cpp
index 735ee340662cc338bc7976a8098ec839e9c22291..56a9dd872245c62f66f345c3679406f52f61f502 100644 (file)
--- a/src/Cursor.cpp
+++ b/src/Cursor.cpp
@@ -607,12 +607,6 @@ void CursorData::endUndoGroup() const
 }
 
 
-void CursorData::splitUndoGroup() const
-{
-       buffer()->undo().splitUndoGroup(*this);
-}
-
-
 void CursorData::recordUndo(pit_type from, pit_type to) const
 {
        buffer()->undo().recordUndo(*this, from, to);

diff --git a/src/Cursor.h b/src/Cursor.h
index 3d3db5daa2b78bd2c481ddcbc6536caf6c58453d..38ddad3502c314f36410d66c76965e567d4ce467 100644 (file)
--- a/src/Cursor.h
+++ b/src/Cursor.h
@@ -183,8 +183,6 @@ public:
        void beginUndoGroup() const;
        /// end the current undo group
        void endUndoGroup() const;
-       /// end abruptly the current group and create a new one wih the same nesting level
-       void splitUndoGroup() const;
 
        /// The general case: prepare undo for an arbitrary range.
        void recordUndo(pit_type from, pit_type to) const;

diff --git a/src/Undo.cpp b/src/Undo.cpp
index a9e0bba8e29a0c4c1ff0019b6fd1996270f85522..5d613f2e0db4f6c84ac4502690c11a11c3b80db8 100644 (file)
--- a/src/Undo.cpp
+++ b/src/Undo.cpp
@@ -610,16 +610,6 @@ void Undo::endUndoGroup(CursorData const & cur_after)
 }
 
 
-void Undo::splitUndoGroup(CursorData const & cur)
-{
-       size_t const level = d->group_level_;
-       d->group_level_ = 1;
-       endUndoGroup(cur);
-       beginUndoGroup(cur);
-       d->group_level_ = level;
-}
-
-
 bool Undo::activeUndoGroup() const
 {
        return d->group_level_ > 0

diff --git a/src/Undo.h b/src/Undo.h
index c2b9b5d074b4e6e8fbef33e40e5aac73e74df3b3..dd7035816d9287a2cbbdee858c9943e0aa3fe5d2 100644 (file)
--- a/src/Undo.h
+++ b/src/Undo.h
@@ -96,8 +96,6 @@ public:
        void endUndoGroup();
        /// end the current undo group and set UndoElement::cur_after if necessary.
        void endUndoGroup(CursorData const & cur_after);
-       /// end abruptly the current group and create a new one wih the same nesting level
-       void splitUndoGroup(CursorData const & cur);
        /// return true if an undo group is open and contains at least one element
        bool activeUndoGroup() const;
 

diff --git a/src/mathed/MathAutoCorrect.cpp b/src/mathed/MathAutoCorrect.cpp
index 77e5fefbd4e7b541d3bce77d6795ae6ffd0b325e..be5aeb42d0430c127179379784f8275431b83437 100644 (file)
--- a/src/mathed/MathAutoCorrect.cpp
+++ b/src/mathed/MathAutoCorrect.cpp
@@ -90,17 +90,8 @@ bool Correction::correct(Cursor & cur, char_type c) const
        LYXERR(Debug::MATHED, "match found! subst in " << cur.cell()
                << " from: '" << from1_ << "' to '" << to_ << '\'');
 
-       /* To allow undoing the completion, we proceed in 4 steps
-        * - inset the raw character
-        * - split undo group so that we have two separate undo actions
-        * - record undo, delete the character we just entered and the from1_ part
-        * - finally, do the insertion of the correction.
-        */
-       cur.insert(c);
-       cur.splitUndoGroup();
-       cur.recordUndoSelection();
-       cur.cell().erase(cur.pos() - n - 1, cur.pos());
-       cur.pos() -= n + 1;
+       cur.cell().erase(cur.pos() - n, cur.pos());
+       cur.pos() -= n;
 
        cur.insert(to_);
        return true;