Merge branch '2.0.x' of git.lyx.org:lyx into 2.0.x

src/Undo.cpp

@@ -249,8 +249,10 @@ void Undo::clear()
 	d->undostack_.clear();
 	d->redostack_.clear();
 	d->undo_finished_ = true;
-	d->group_id = 0;
-	d->group_level = 0;
+	// We used to do that, but I believe it is better to keep
+	// groups (only used in Buffer::reload for now (JMarc)
+	//d->group_id = 0;
+	//d->group_level = 0;
 }
 
 
@@ -511,8 +513,10 @@ void Undo::beginUndoGroup()
 
 void Undo::endUndoGroup()
 {
-	if (d->group_level == 0)
+	if (d->group_level == 0) {
 		LYXERR0("There is no undo group to end here");
+		return;
+	}
 	--d->group_level;
 	if (d->group_level == 0) {
 		// real end of the group

status.20x

@@ -133,6 +133,9 @@ What's new
 - Make sure that undo restores paragraph longest label width correctly
   (bug 8242).
 
+- Fix undo machinery confusion after checking in a document under version
+  control (bug 8342).
+
 - Do not forget the undo information when doing a Save As...
 
 - Replace current selection when pasting (bug 8027).