From: Georg Baum <Georg.Baum@post.rwth-aachen.de>
Date: Sun, 12 Nov 2006 15:48:33 +0000 (+0000)
Subject: Fix bug 2982 (two undo steps are needed to undo inset-dissolve)
X-Git-Tag: 1.6.10~11906
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=c0725c5bebfdb1cab048aa4a81e99c721ceadfdc;p=features.git

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 bce7e334d2..f21b1a2179 100644
--- 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 654009914b..e2c3afedb5 100644
--- 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;