X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferView.cpp;h=d5ee51739c26aa8ffddf2034d4a96cdb706857d8;hb=cf15bd840b71a01ccbb2fbbbabc7066237b4bfd2;hp=c6d5b6aee867f750751e7aac6fbbaa4aa80bb673;hpb=1cca0a86bdd43b08af7cb02db78e2621abe9465d;p=lyx.git

diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index c6d5b6aee8..d5ee51739c 100644
--- a/src/BufferView.cpp
+++ b/src/BufferView.cpp
@@ -1802,6 +1802,10 @@ void BufferView::updateMetrics()
 	if (d->inlineCompletionPos.fixIfBroken())
 		d->inlineCompletionPos = DocIterator();
 	
+	if (d->anchor_pit_ >= npit)
+		// The anchor pit must have been deleted...
+		d->anchor_pit_ = npit - 1;
+
 	// Rebreak anchor paragraph.
 	tm.redoParagraph(d->anchor_pit_);
 	ParagraphMetrics & anchor_pm = tm.par_metrics_[d->anchor_pit_];
@@ -1887,7 +1891,7 @@ void BufferView::insertLyXFile(FileName const & fname)
 		el = buf.errorList("Parse");
 		buffer_.undo().recordUndo(d->cursor_);
 		cap::pasteParagraphList(d->cursor_, buf.paragraphs(),
-					     buf.params().textClassPtr(), el);
+					     buf.params().documentClassPtr(), el);
 		res = _("Document %1$s inserted.");
 	} else {
 		res = _("Could not insert document %1$s");
@@ -2221,7 +2225,7 @@ void BufferView::setInlineCompletion(Cursor & cur, DocIterator const & pos,
 	
 	// set update flags
 	if (changed) {
-		if (singlePar && !(cur.disp_.update() | Update::Force))
+		if (singlePar && !(cur.disp_.update() & Update::Force))
 			cur.updateFlags(cur.disp_.update() | Update::SinglePar);
 		else
 			cur.updateFlags(cur.disp_.update() | Update::Force);