From: Michael Schmitt <michael.schmitt@teststep.org>
Date: Sun, 26 Nov 2006 13:35:11 +0000 (+0000)
Subject: 	* src/paragraph_funcs.C: remove FIXMEs for change tracking
X-Git-Tag: 1.6.10~11751
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=9095690af0c90bfc80834b5d5a49bfb32ff929e2;p=lyx.git

	* src/paragraph_funcs.C: remove FIXMEs for change tracking
	(everything was fine); output lyxerr debug message


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

diff --git a/src/paragraph_funcs.C b/src/paragraph_funcs.C
index f1af41bf81..5c9b6b972b 100644
--- a/src/paragraph_funcs.C
+++ b/src/paragraph_funcs.C
@@ -15,11 +15,13 @@
 #include "bufferparams.h"
 #include "lyxtext.h"
 #include "paragraph_pimpl.h"
+#include "debug.h"
 
 
 namespace lyx {
 
 using std::string;
+using std::endl;
 
 
 static bool moveItem(Paragraph & fromPar, pos_type fromPos,
@@ -185,22 +187,25 @@ void mergeParagraph(BufferParams const & bparams,
 	pos_type pos_end = next.size() - 1;
 	pos_type pos_insert = par.size();
 
-	// The imaginary end-of-paragraph character (at par.size()) has to be
+	// the imaginary end-of-paragraph character (at par.size()) has to be
 	// marked as unmodified. Otherwise, its change is adopted by the first
 	// character of the next paragraph.
-	
-	// FIXME: change tracking (MG)
-	par.setChange(par.size(), Change(Change::UNCHANGED));
+	if (par.lookupChange(par.size()).type != Change::UNCHANGED) {
+		lyxerr[Debug::CHANGES] <<
+		   "merging par with inserted/deleted end-of-par character" << endl;
+		par.setChange(par.size(), Change(Change::UNCHANGED));
+	}
 
 	Change change = next.lookupChange(next.size());
-	// ok, now copy the paragraph
+
+	// move the content of the second paragraph to the end of the first one
 	for (pos_type i = 0, j = pos_insert; i <= pos_end; ++i) {
 		if (moveItem(next, 0, par, j, bparams)) {
 			++j;
 		}
 	}
-	// Move the change of the end-of-paragraph character
-	// FIXME: change tracking (MG)
+
+	// move the change of the end-of-paragraph character
 	par.setChange(par.size(), change);
 
 	pars.erase(boost::next(pars.begin(), par_offset + 1));