X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBuffer.cpp;h=96005b92157f18b816c8dbc965d66c4faf994cc5;hb=75aaa8e22b2bec4d3c03712ca09ba13414ee6175;hp=0f7ecb08d77b738e4ff106cf273762ebc61edd4b;hpb=997f0621c5346bb623cf86713c4fe1be0c941104;p=features.git

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 0f7ecb08d7..96005b9215 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -1145,7 +1145,7 @@ bool Buffer::importFile(string const & format, FileName const & name, ErrorList
 
 	FileName const lyx = tempFileName("Buffer_importFileXXXXXX.lyx");
 	Converters::RetVal const retval =
-		theConverters().convert(nullptr, name, lyx, name, format, "lyx", errorList);
+		theConverters().convert(this, name, lyx, name, format, "lyx", errorList);
 	if (retval == Converters::SUCCESS) {
 		bool const success = readFile(lyx) == ReadSuccess;
 		removeTempFile(lyx);
@@ -4935,6 +4935,10 @@ void Buffer::updateBuffer(UpdateScope scope, UpdateType utype) const
 {
 	LBUFERR(!text().paragraphs().empty());
 
+	// This can be called when loading a file, so that there be no
+	// open undo group.
+	UndoGroupHelper ugh(const_cast<Buffer *>(this));
+
 	// Use the master text class also for child documents
 	Buffer const * const master = masterBuffer();
 	DocumentClass const & textclass = master->params().documentClass();
@@ -5158,7 +5162,10 @@ void Buffer::Impl::setLabel(ParIterator & it, UpdateType utype) const
 	switch(layout.labeltype) {
 	case LABEL_ITEMIZE: {
 		par.params().labelString(
-			bp.user_defined_bullet(par.itemdepth).getUnicode());
+			(par.itemdepth < 4)
+					? bp.user_defined_bullet(par.itemdepth).getLabel()
+					  // Display fallback for too deeply nested items
+					: bformat(from_ascii("[?%1$d]"), int(par.itemdepth + 1)));
 		break;
 	}