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 9076e6ec38feb64f67311da748392f62393eacfc..143151d4eacfd04e440ac4ee8cd56d9b099fba8a 100644 (file)
--- 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