X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fparagraph_funcs.C;h=95c7c1552633e5d0cd4a93812187742c9499eea2;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=6a6230ebe12c95a3c82a7d8043a365fb1d5221a5;hpb=c15a94ccf003f52e9e5acd97920d5548cd81b0d1;p=lyx.git

diff --git a/src/paragraph_funcs.C b/src/paragraph_funcs.C
index 6a6230ebe1..95c7c15526 100644
--- a/src/paragraph_funcs.C
+++ b/src/paragraph_funcs.C
@@ -179,7 +179,7 @@ void breakParagraphConservative(BufferParams const & bparams,
 		tmp.setChange(tmp.size(), Change(par.lookupChange(par.size()).type));
 
 		// If tracking changes, set all the text that is to be
-		// erased to Type::INSERTED.
+		// erased to Change::INSERTED.
 		for (pos_type k = pos_end; k >= pos; --k) {
 			if (bparams.trackChanges)
 				// FIXME: Change tracking (MG)
@@ -200,30 +200,23 @@ void mergeParagraph(BufferParams const & bparams,
 	pos_type pos_end = next.size() - 1;
 	pos_type pos_insert = par.size();
 
-	// What happens is the following. Later on, moveItem() will copy
-	// over characters from the next paragraph to be inserted into this
-	// position. Now, if the first char to be so copied is "red" (i.e.,
-	// marked deleted) and the paragraph break is marked "blue",
-	// insertChar will trigger (eventually, through record(), and see
-	// del() and erase() in changes.C) a "hard" character deletion.
-	// Which doesn't make sense of course at this pos, but the effect is
-	// to shorten the change range to which this para break belongs, by
-	// one. It will (should) remain "orphaned", having no CT info to it,
-	// and check() in changes.C will assert. Setting the para break
-	// forcibly to "black" prevents this scenario. -- MV 13.3.2006
+	// 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));
 
-	Change::Type cr = next.lookupChange(next.size()).type;
+	Change change = next.lookupChange(next.size());
 	// ok, now copy the paragraph
 	for (pos_type i = 0, j = 0; i <= pos_end; ++i) {
 		if (moveItem(next, i, par, pos_insert + j, bparams)) {
 			++j;
 		}
 	}
-	// Move the change status of "carriage return" over
+	// Move the change of the end-of-paragraph character
 	// FIXME: change tracking (MG)
-	par.setChange(par.size(), Change(cr));
+	par.setChange(par.size(), change);
 
 	pars.erase(boost::next(pars.begin(), par_offset + 1));
 }