From: Michael Schmitt <michael.schmitt@teststep.org>
Date: Fri, 20 Oct 2006 13:29:26 +0000 (+0000)
Subject: change tracking:
X-Git-Tag: 1.6.10~12315
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=789cfa90abd0b88c9949fbf3c3544297c6dbd756;p=features.git

change tracking:

	src/text2.C: invoke insertInset with correct
	Change parameter; only check for change _type_
	(DELETED) for DEPM purposes


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

diff --git a/src/text2.C b/src/text2.C
index 9076e6ec38..143151d4ea 100644
--- a/src/text2.C
+++ b/src/text2.C
@@ -648,8 +648,9 @@ void LyXText::insertInset(LCursor & cur, InsetBase * inset)
 {
 	BOOST_ASSERT(this == cur.text());
 	BOOST_ASSERT(inset);
-	// FIXME: change tracking (MG)
-	cur.paragraph().insertInset(cur.pos(), inset, Change(Change::INSERTED));
+	cur.paragraph().insertInset(cur.pos(), inset, 
+				    Change(cur.buffer().params().trackChanges ?
+				    	   Change::INSERTED : Change::UNCHANGED));
 }
 
 
@@ -1262,9 +1263,8 @@ bool LyXText::deleteEmptyParagraphMechanism(LCursor & cur, LCursor & old)
 		    && old.pos() < oldpar.size()
 		    && oldpar.isLineSeparator(old.pos())
 		    && oldpar.isLineSeparator(old.pos() - 1)
-		// FIXME: change tracking (MG)
-		    && oldpar.lookupChange(old.pos() - 1) != Change(Change::DELETED)) {
-			oldpar.erase(old.pos() - 1, false);  // do not track changes in DEPM
+		    && oldpar.lookupChange(old.pos() - 1).type != Change::DELETED) {
+			oldpar.erase(old.pos() - 1, false); // do not track changes in DEPM
 #ifdef WITH_WARNINGS
 #warning This will not work anymore when we have multiple views of the same buffer
 // In this case, we will have to correct also the cursors held by