Fix bug 2982 (two undo steps are needed to undo inset-dissolve)

	* src/CutAndPaste.C
	(pasteParagraphList): Don't record undo info here...

	* src/BufferView.C
	(BufferView::menuInsertLyXFile): ... but here instead

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15886 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/BufferView.C b/src/BufferView.C
index bce7e334d2c7f41d2cdf5703fe6ce3f22328873b..f21b1a2179fafcb455bb55e68cb1614743c80396 100644 (file)
--- a/src/BufferView.C
+++ b/src/BufferView.C
@@ -1369,6 +1369,7 @@ void BufferView::menuInsertLyXFile(string const & filenm)
                ErrorList & el = buffer_->errorList("Parse");
                // Copy the inserted document error list into the current buffer one.
                el = buf.errorList("Parse");
+               recordUndo(cursor_);
                cap::pasteParagraphList(cursor_, buf.paragraphs(),
                                             buf.params().textclass, el);
                res = _("Document %1$s inserted.");

diff --git a/src/CutAndPaste.C b/src/CutAndPaste.C
index 654009914b561bbf6a01b07763f47207f5f50741..e2c3afedb56403d3bf8ea62f783ecc67f4d6fc78 100644 (file)
--- a/src/CutAndPaste.C
+++ b/src/CutAndPaste.C
@@ -621,8 +621,6 @@ void pasteParagraphList(LCursor & cur, ParagraphList const & parlist,
                LyXText * text = cur.text();
                BOOST_ASSERT(text);
 
-               recordUndo(cur);
-
                pit_type endpit;
                PitPosPair ppp;