X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FUndo.cpp;h=01394bc27f79ff2a309be37d55f58b5a7644949c;hb=b80e9503feea2e66c0bcc2b45b413aad1a9a61e2;hp=143af4e83ff0b9f29eac7ecc2f1abbf5e6c8ceb4;hpb=82b6dc8aa9c8f5f09d1b6643afd959d86bc4afa3;p=lyx.git

diff --git a/src/Undo.cpp b/src/Undo.cpp
index 143af4e83f..01394bc27f 100644
--- a/src/Undo.cpp
+++ b/src/Undo.cpp
@@ -18,6 +18,7 @@
 #include "Undo.h"
 
 #include "Buffer.h"
+#include "BufferList.h"
 #include "BufferParams.h"
 #include "buffer_funcs.h"
 #include "Cursor.h"
@@ -40,6 +41,7 @@
 
 #include <algorithm>
 #include <deque>
+#include <set>
 
 using namespace std;
 using namespace lyx::support;
@@ -562,7 +564,8 @@ void Undo::beginUndoGroup()
 	if (d->group_level_ == 0) {
 		// create a new group
 		++d->group_id_;
-		LYXERR(Debug::UNDO, "+++++++Creating new group " << d->group_id_);
+		LYXERR(Debug::UNDO, "+++++++ Creating new group " << d->group_id_
+		       << " for buffer " << &d->buffer_);
 	}
 	++d->group_level_;
 }
@@ -586,7 +589,8 @@ void Undo::endUndoGroup()
 	if (d->group_level_ == 0) {
 		// real end of the group
 		d->group_cur_before_ = CursorData();
-		LYXERR(Debug::UNDO, "-------End of group " << d->group_id_);
+		LYXERR(Debug::UNDO, "------- End of group " << d->group_id_
+		       << " of buffer " << &d->buffer_);
 	}
 }
 
@@ -643,15 +647,32 @@ void Undo::recordUndoFullBuffer(CursorData const & cur)
 
 /// UndoGroupHelper class stuff
 
+class UndoGroupHelper::Impl {
+	friend class UndoGroupHelper;
+	set<Buffer *> buffers_;
+};
+
+
+UndoGroupHelper::UndoGroupHelper(Buffer * buf) : d(new UndoGroupHelper::Impl)
+{
+	resetBuffer(buf);
+}
+
+
+UndoGroupHelper::~UndoGroupHelper()
+{
+	for (Buffer * buf : d->buffers_)
+		if (theBufferList().isLoaded(buf) || theBufferList().isInternal(buf))
+			buf->undo().endUndoGroup();
+	delete d;
+}
+
 void UndoGroupHelper::resetBuffer(Buffer * buf)
 {
-	if (buf == buffer_)
-		return;
-	if (buffer_)
-		buffer_->undo().endUndoGroup();
-	buffer_ = buf;
-	if (buffer_)
-		buffer_->undo().beginUndoGroup();
+	if (buf && d->buffers_.count(buf) == 0) {
+		d->buffers_.insert(buf);
+		buf->undo().beginUndoGroup();
+	}
 }