Replace the hardcoded TEXT_TO_INSET_OFFSET by tunable values

[lyx.git] / src / Text.cpp

diff --git a/src/Text.cpp b/src/Text.cpp
index 6d5f7dd6b88fc2c341fcb8babd45ebe05235d491..dc296384b266a22f76fecdd688677d12ccd1f048 100644 (file)
--- a/src/Text.cpp
+++ b/src/Text.cpp
@@ -1768,7 +1768,7 @@ bool Text::backspace(Cursor & cur)
        needsUpdate |= handleBibitems(cur);
 
        // A singlePar update is not enough in this case.
-//             cur.screenUpdateFlags(Update::Force);
+       // cur.screenUpdateFlags(Update::Force);
        cur.top().setPitPos(cur.pit(), cur.pos());
 
        return needsUpdate;
@@ -1813,8 +1813,9 @@ bool Text::dissolveInset(Cursor & cur)
                // but we'll try the cheaper solution here.
                cur.buffer()->clearReferenceCache();
 
-               // Do not revive deleted text
-               lyx::acceptChanges(plist, b.params());
+               if (!lyxrc.ct_markup_copied)
+                       // Do not revive deleted text
+                       lyx::acceptChanges(plist, b.params());
 
                // ERT paragraphs have the Language latex_language.
                // This is invalid outside of ERT, so we need to