X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FUndo.cpp;h=a24bdead03e3861df2d6d18ab52e0b738be626ed;hb=9577dae301866e69016c26300826114a611ea779;hp=a0e84e43ec7ccdfd4a2bc209bab2d97e90ec82c5;hpb=f1cba8ff64b369792fd49f5ddf90e8126ab476ac;p=lyx.git

diff --git a/src/Undo.cpp b/src/Undo.cpp
index a0e84e43ec..a24bdead03 100644
--- a/src/Undo.cpp
+++ b/src/Undo.cpp
@@ -346,7 +346,7 @@ void Undo::Private::doTextUndoOrRedo(DocIterator & cur, UndoElementStack & stack
 	// try to return early.
 
 	// We will store in otherstack the part of the document under 'undo'
-	DocIterator cell_dit = undo.cell.asDocIterator(&buffer_.inset());
+	DocIterator cell_dit = undo.cell.asDocIterator(&buffer_);
 
 	doRecordUndo(ATOMIC_UNDO, cell_dit,
 		undo.from, cell_dit.lastpit() - undo.end, cur,
@@ -354,7 +354,7 @@ void Undo::Private::doTextUndoOrRedo(DocIterator & cur, UndoElementStack & stack
 
 	// This does the actual undo/redo.
 	//LYXERR0("undo, performing: " << undo);
-	DocIterator dit = undo.cell.asDocIterator(&buffer_.inset());
+	DocIterator dit = undo.cell.asDocIterator(&buffer_);
 	if (undo.isFullBuffer) {
 		LASSERT(undo.pars, /**/);
 		// This is a full document
@@ -404,7 +404,7 @@ void Undo::Private::doTextUndoOrRedo(DocIterator & cur, UndoElementStack & stack
 	LASSERT(undo.pars == 0, /**/);
 	LASSERT(undo.array == 0, /**/);
 
-	cur = undo.cursor.asDocIterator(&buffer_.inset());
+	cur = undo.cursor.asDocIterator(&buffer_);
 	// Now that we're done with undo, we pop it off the stack.
 	stack.pop();
 }
@@ -426,8 +426,9 @@ bool Undo::Private::textUndoOrRedo(DocIterator & cur, bool isUndoOperation)
 	while (!stack.empty() && stack.top().group_id == gid)
 		doTextUndoOrRedo(cur, stack, otherstack);
 
-	// Addapt the new material to current buffer.
-	updateLabels(buffer_);
+	// Adapt the new material to current buffer.
+	buffer_.setBuffersForInsets(); // FIXME This shouldn't be here.
+	buffer_.updateLabels();
 	return true;
 }
 
@@ -509,7 +510,7 @@ void Undo::recordUndoFullDocument(DocIterator const & cur)
 	beginUndoGroup();
 	d->doRecordUndo(
 		ATOMIC_UNDO,
-		doc_iterator_begin(d->buffer_.inset()),
+		doc_iterator_begin(&d->buffer_),
 		0, d->buffer_.paragraphs().size() - 1,
 		cur,
 		true,