inset-split should not be dispatched to inset at point

[lyx.git] / src / CutAndPaste.cpp

diff --git a/src/CutAndPaste.cpp b/src/CutAndPaste.cpp
index 0446175e6988291845b051e8412fef3b233fa787..b5147ae6e011334f661acdb618788594750a3a7a 100644 (file)
--- a/src/CutAndPaste.cpp
+++ b/src/CutAndPaste.cpp
@@ -554,10 +554,7 @@ PitPosPair eraseSelectionHelper(BufferParams const & params,
                pars[pit].eraseChars(left, right, params.track_changes);
 
                // Separate handling of paragraph break:
-               if (merge && pit != endpit &&
-                   (pit + 1 != endpit
-                    || pars[pit].hasSameLayout(pars[endpit])
-                    || pars[endpit].size() == endpos)) {
+        if (merge && pit != endpit) {
                        if (pit + 1 == endpit)
                                endpos += pars[pit].size();
                        mergeParagraph(params, pars, pit);
@@ -1037,7 +1034,9 @@ void copySelection(Cursor const & cur)
 }
 
 
-void copyInset(Cursor const & cur, Inset * inset, docstring const & plaintext)
+namespace {
+
+void copyInsetToStack(Cursor const & cur, CutStack & cutstack, Inset * inset)
 {
        ParagraphList pars;
        Paragraph par;
@@ -1046,13 +1045,28 @@ void copyInset(Cursor const & cur, Inset * inset, docstring const & plaintext)
        Font font(inherit_font, bp.language);
        par.insertInset(0, inset, font, Change(Change::UNCHANGED));
        pars.push_back(par);
-       theCuts.push(make_pair(pars, make_pair(bp.documentClassPtr(), bp.authors())));
+       cutstack.push(make_pair(pars, make_pair(bp.documentClassPtr(), bp.authors())));
+}
+
+}
+
+
+void copyInset(Cursor const & cur, Inset * inset, docstring const & plaintext)
+{
+       copyInsetToStack(cur, theCuts, inset);
 
        // stuff the selection onto the X clipboard, from an explicit copy request
+       BufferParams const & bp = cur.buffer()->params();
        putClipboard(theCuts[0].first, theCuts[0].second, plaintext, bp);
 }
 
 
+void copyInsetToTemp(Cursor const & cur, Inset * inset)
+{
+       copyInsetToStack(cur, tempCut, inset);
+}
+
+
 namespace {
 
 void copySelectionToStack(CursorData const & cur, CutStack & cutstack)