aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNeil Hodgson <nyamatongwe@gmail.com>2015-05-21 10:21:13 +1000
committerNeil Hodgson <nyamatongwe@gmail.com>2015-05-21 10:21:13 +1000
commit697ce60c7dcef8dfa9a94fcf2163845fca36b296 (patch)
treea7c6687283faaa75a75bfd221912814b74f433e7
parent172c81f3d02a240b5b4b8d7215bcfecfbf5fa9f3 (diff)
downloadscintilla-mirror-697ce60c7dcef8dfa9a94fcf2163845fca36b296.tar.gz
Fix bug with TentativeUndo where the undo history was being damaged on OS X.
For example the sequence ['a', 'c', left, 'b', undo] would produce "c" instead of "ac".
-rw-r--r--src/Document.cxx2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/Document.cxx b/src/Document.cxx
index 7d34dace1..3f365fdf4 100644
--- a/src/Document.cxx
+++ b/src/Document.cxx
@@ -216,6 +216,8 @@ void Document::SetSavePoint() {
}
void Document::TentativeUndo() {
+ if (!TentativeActive())
+ return;
CheckReadOnly();
if (enteredModification == 0) {
enteredModification++;