From 9434647675ef0e65148b119cad80c0acf24c7b68 Mon Sep 17 00:00:00 2001
From: nyamatongwe <unknown>
Date: Tue, 16 Jan 2001 10:17:11 +0000
Subject: Changed undo node coalescing so that a paste followed by typing
 creates two undo steps - one for the typing and one for the paste.

---
 src/CellBuffer.cxx | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/CellBuffer.cxx')

diff --git a/src/CellBuffer.cxx b/src/CellBuffer.cxx
index befec75fc..82bf42ee7 100644
--- a/src/CellBuffer.cxx
+++ b/src/CellBuffer.cxx
@@ -458,6 +458,9 @@ void UndoHistory::AppendAction(actionType at, int position, char *data, int leng
 			           (position != (actPrevious.position + actPrevious.lenData*2))) {
 				// Insertions must be immediately after to coalesce
 				currentAction++;
+            } else if (!actions[currentAction].mayCoalesce) {
+				// Not allowed to coalesce if this set
+				currentAction++;
 			} else {
 				//Platform::DebugPrintf("action coalesced\n");
 			}
-- 
cgit v1.2.3