again some things which cherry pick did not catch, sorry

[lyx.git] / src / Cursor.cpp

diff --git a/src/Cursor.cpp b/src/Cursor.cpp
index b20e981b32c506cab09c2e7cc34e1989bc0a55b9..7a13e1c3c9a5229997f8e8295c533d5dd540a32f 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) {
@@ -1968,8 +1968,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 +1998,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 +2413,7 @@ void Cursor::beginUndoGroup() const
 
 void Cursor::endUndoGroup() const
 {
-       buffer()->undo().endUndoGroup();
+       buffer()->undo().endUndoGroup(*this);
 }