Replace the hardcoded TEXT_TO_INSET_OFFSET by tunable values

[lyx.git] / src / Text3.cpp

diff --git a/src/Text3.cpp b/src/Text3.cpp
index a91660336b3de3588bd1abee8bac29650228c4e7..8643411da1cf0d695fc5c04fd478ccc84afb6cfc 100644 (file)
--- a/src/Text3.cpp
+++ b/src/Text3.cpp
@@ -581,7 +581,6 @@ Language const * getLanguage(Cursor const & cur, string const & lang)
 docstring resolveLayout(docstring layout, DocIterator const & dit)
 {
        Paragraph const & par = dit.paragraph();
-       docstring const old_layout = par.layout().name();
        DocumentClass const & tclass = dit.buffer()->params().documentClass();
 
        if (layout.empty())
@@ -1251,7 +1250,13 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                                }
                        }
                } else {
+                       DocIterator const dit = cur.selectionBegin();
                        cutSelection(cur, false);
+                       if (cur.buffer()->params().track_changes)
+                               // since we're doing backwards deletion,
+                               // and the selection is not really cut,
+                               // move cursor before selection (#11630)
+                               cur.setCursor(dit);
                        singleParUpdate = false;
                }
                break;
@@ -1523,6 +1528,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                }
 
                bv->buffer().errors("Paste");
+               bv->buffer().updatePreviews(); // bug 11619
                cur.clearSelection(); // bug 393
                cur.finishUndo();
                break;