diff options
author | Dani Megert | 2009-08-25 09:01:16 +0000 |
---|---|---|
committer | Dani Megert | 2009-08-25 09:01:16 +0000 |
commit | b46ca2381ec5025a2661897ee4029261a652dade (patch) | |
tree | ecb028d6fef6a47bd795299371558a0f8143c580 /org.eclipse.text | |
parent | 705f123d2d893bbf25d29b1ef7d8d4867cabe393 (diff) | |
download | eclipse.platform.text-b46ca2381ec5025a2661897ee4029261a652dade.tar.gz eclipse.platform.text-b46ca2381ec5025a2661897ee4029261a652dade.tar.xz eclipse.platform.text-b46ca2381ec5025a2661897ee4029261a652dade.zip |
Fixed bug 269039: [typing] After an undo followed by a text edit, the rest of the text undo history becomes inaccessiblev20090902-1317v20090901-0800v20090825-0800
Diffstat (limited to 'org.eclipse.text')
-rw-r--r-- | org.eclipse.text/src/org/eclipse/text/undo/DocumentUndoManager.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/org.eclipse.text/src/org/eclipse/text/undo/DocumentUndoManager.java b/org.eclipse.text/src/org/eclipse/text/undo/DocumentUndoManager.java index b28b7d1bc75..6f36f682d37 100644 --- a/org.eclipse.text/src/org/eclipse/text/undo/DocumentUndoManager.java +++ b/org.eclipse.text/src/org/eclipse/text/undo/DocumentUndoManager.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2008 IBM Corporation and others. + * Copyright (c) 2006, 2009 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -162,7 +162,7 @@ public class DocumentUndoManager implements IDocumentUndoManager { // Normal case: an undo is valid if its redo will restore // document to its current modification stamp boolean canUndo= docStamp == IDocumentExtension4.UNKNOWN_MODIFICATION_STAMP - || docStamp == getRedoModificationStamp(); + || docStamp >= getRedoModificationStamp(); /* * Special case to check if the answer is false. If the last @@ -1028,8 +1028,8 @@ public class DocumentUndoManager implements IDocumentUndoManager { private void processChange(int modelStart, int modelEnd, String insertedText, String replacedText, - long beforeChangeModificationStamp, - long afterChangeModificationStamp) { + final long beforeChangeModificationStamp, + final long afterChangeModificationStamp) { if (insertedText == null) insertedText= ""; //$NON-NLS-1$ |