Fix a copy-paste error introduced in b754fb02

[lyx.git] / src / Cursor.cpp

diff --git a/src/Cursor.cpp b/src/Cursor.cpp
index 22b75b5a2613fd67c940db5a42af6f5edbc91fb6..be042940a081b3806ca129c6f0d657f8f081b99e 100644 (file)
--- a/src/Cursor.cpp
+++ b/src/Cursor.cpp
@@ -334,7 +334,7 @@ void Cursor::dispatch(FuncRequest const & cmd0)
        Cursor old = *this;
        disp_ = DispatchResult();
 
-       buffer()->undo().beginUndoGroup();
+       beginUndoGroup();
 
        // Is this a function that acts on inset at point?
        if (lyxaction.funcHasFlag(cmd.action(), LyXAction::AtPoint)
@@ -346,7 +346,7 @@ void Cursor::dispatch(FuncRequest const & cmd0)
                        << cmd0 << endl << *this);
                nextInset()->dispatch(*this, tmpcmd);
                if (disp_.dispatched()) {
-                       buffer()->undo().endUndoGroup();
+                       endUndoGroup();
                        return;
                }
        }
@@ -391,7 +391,7 @@ void Cursor::dispatch(FuncRequest const & cmd0)
                // are possible which would change it
                beforeDispatchCursor_ = safe.beforeDispatchCursor_;
        }
-       buffer()->undo().endUndoGroup();
+       endUndoGroup();
 
        // notify insets we just left
        if (*this != old) {
@@ -518,14 +518,14 @@ void Cursor::setCursorToAnchor()
 }
 
 
-void Cursor::markEditPosition()
+void Cursor::markNewWordPosition()
 {
        if (lyxrc.spellcheck_continuously && inTexted() && new_word_.empty()) {
-               FontSpan ow = locateWord(WHOLE_WORD);
-               if (ow.size() == 1) {
+               FontSpan nw = locateWord(WHOLE_WORD);
+               if (nw.size() == 1) {
                        LYXERR(Debug::DEBUG, "start new word: "
                                << " par: " << pit()
-                               << " pos: " << ow.first);
+                               << " pos: " << nw.first);
                        new_word_ = *this;
                }
        }
@@ -1599,8 +1599,11 @@ bool Cursor::macroModeClose()
 
        docstring const name = s.substr(1);
        InsetMathNest * const in = inset().asInsetMath()->asNestInset();
-       if (in && in->interpretString(*this, s))
+       if (in && in->interpretString(*this, s)) {
+               // end undo group that was opened before in was created
+               endUndoGroup();
                return true;
+       }
        MathAtom atom = buffer()->getMacro(name, *this, false) ?
                MathAtom(new MathMacro(buffer(), name)) : createInsetMath(name, buffer());
 
@@ -1633,7 +1636,9 @@ bool Cursor::macroModeClose()
                else
                        insert(selection);
        }
-       
+
+       // end undo group that was opened before in was created
+       endUndoGroup();
        return true;
 }
 
@@ -1968,8 +1973,12 @@ bool Cursor::upDownInText(bool up, bool & updateNeeded)
 
                        updateNeeded |= bv().checkDepm(dummy, *this);
                        updateTextTargetOffset();
-                       if (updateNeeded)
+                       if (updateNeeded) {
                                forceBufferUpdate();
+                               // DEPM may have requested a screen update
+                               this->screenUpdateFlags(
+                                       this->screenUpdate() | dummy.screenUpdate());
+                       }
                }
                return false;
        }
@@ -1994,7 +2003,8 @@ bool Cursor::upDownInText(bool up, bool & updateNeeded)
                        ++dummy.pos();
                if (bv().checkDepm(dummy, old)) {
                        updateNeeded = true;
-                       // Make sure that cur gets back whatever happened to dummy (Lgb) 
+                       // Make sure that cur gets back whatever happened to dummy (Lgb)
+                       // This will include any screen update requested by DEPM
                        operator=(dummy);
                }
        } else {
@@ -2408,7 +2418,7 @@ void Cursor::beginUndoGroup() const
 
 void Cursor::endUndoGroup() const
 {
-       buffer()->undo().endUndoGroup();
+       buffer()->undo().endUndoGroup(*this);
 }