aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
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
commit270b7ad326c83b9c2df9bd31284d566eee70cf7d (patch)
treebad9a538d8fcf1e721a2a48f36239372cd23bb48 /src
parent93103de7a6612a3a5e5328327340d636a87577d2 (diff)
downloadscintilla-mirror-270b7ad326c83b9c2df9bd31284d566eee70cf7d.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".
Diffstat (limited to 'src')
-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++;