X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCompare.cpp;h=68bd632d2d2bce02c65189eb5c2bf078a65312b8;hb=da67bde61af6dfecef7a237b72b878fe30638a81;hp=931fe76fafe2ea81091d38e848bb469ae32c2f16;hpb=b9e29418471d0d275650c52f976da300f4f42501;p=lyx.git

diff --git a/src/Compare.cpp b/src/Compare.cpp
index 931fe76faf..68bd632d2d 100644
--- a/src/Compare.cpp
+++ b/src/Compare.cpp
@@ -439,8 +439,8 @@ static void getParagraphList(DocRange const & range,
 	pit_type startpit = range.from.pit();
 	pit_type endpit = range.to.pit();
 	ParagraphList const & ps_ = range.text()->paragraphs();
-	ParagraphList tmp_pars(lyx::next(ps_.begin(), startpit),
-		lyx::next(ps_.begin(), endpit + 1));
+	ParagraphList tmp_pars(ps_.iterator_at(startpit),
+		ps_.iterator_at(endpit + 1));
 
 	// Remove the end of the last paragraph; afterwards, remove the
 	// beginning of the first paragraph. Keep this order - there may only
@@ -881,10 +881,10 @@ void Compare::Impl::writeToDestBuffer(DocRange const & range,
 
 void Compare::Impl::writeToDestBuffer(ParagraphList const & pars) const
 {
+	pit_type const pit = dest_pars_->size() - 1;
 	dest_pars_->insert(dest_pars_->end(), pars.begin(), pars.end());
-	pit_type pit = dest_pars_->size();
-	if (pit > 0)
-		mergeParagraph(dest_buf_->params(), *dest_pars_, pit - 1);
+	if (pit >= 0)
+		mergeParagraph(dest_buf_->params(), *dest_pars_, pit);
 }