aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/CellBuffer.cxx
diff options
context:
space:
mode:
authornyamatongwe <unknown>2001-01-16 10:17:11 +0000
committernyamatongwe <unknown>2001-01-16 10:17:11 +0000
commit9434647675ef0e65148b119cad80c0acf24c7b68 (patch)
treedd70e97b27a991f8902bdc1417eab1e26884d3cb /src/CellBuffer.cxx
parentf1dafc43a6a6dd32d7f91935bc6be065d84d305b (diff)
downloadscintilla-mirror-9434647675ef0e65148b119cad80c0acf24c7b68.tar.gz
Changed undo node coalescing so that a paste followed by typing creates
two undo steps - one for the typing and one for the paste.
Diffstat (limited to 'src/CellBuffer.cxx')
-rw-r--r--src/CellBuffer.cxx3
1 files changed, 3 insertions, 0 deletions
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");
}