aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/CellBuffer.cxx
diff options
context:
space:
mode:
authornyamatongwe <devnull@localhost>2001-01-16 10:17:11 +0000
committernyamatongwe <devnull@localhost>2001-01-16 10:17:11 +0000
commitca706e65ca3466b74370ecb69b26b4d095b29993 (patch)
treedd70e97b27a991f8902bdc1417eab1e26884d3cb /src/CellBuffer.cxx
parenta1ba40016020f4b3ea300ec4a70085ea487c32ab (diff)
downloadscintilla-mirror-ca706e65ca3466b74370ecb69b26b4d095b29993.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");
}