# HG changeset patch
# User dadubrow
# Date 1249678206 18000
# Node ID 2ee12718a766c5f626112b63b5080e8f00805ae2
# Parent  56887eb7b034a30e5110ada75a30ec5787c02be8# Parent  6b88a951e72a171672421868ef10621dfd35364f
merge commit

diff -r 6b88a951e72a -r 2ee12718a766 core/com.nokia.carbide.cpp.doc.user/html/reference/images/carbide_proj_settings_sbsv1.png
diff -r 6b88a951e72a -r 2ee12718a766 project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/editors/common/CarbideFormEditor.java
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/editors/common/CarbideFormEditor.java	Fri Aug 07 15:25:12 2009 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/editors/common/CarbideFormEditor.java	Fri Aug 07 15:50:06 2009 -0500
@@ -188,9 +188,6 @@
 		baseEditorContext.textEditorContext = undoManager.getUndoContext();
 		baseEditorContext.allContext.addMatch(baseEditorContext.textEditorContext);
 		baseEditorContext.modelOperationContext.addMatch(baseEditorContext.textEditorContext);
-		
-		// mark the buffer dirty to inhibit auto-reload. See comments on setBufferDirty
-		textEditorPage.setBufferDirty(true);
 	}
 	
 	@Override
@@ -236,6 +233,8 @@
 			// user must have undone everything.
 			result = true;
 		}
+		// mark the buffer dirty to inhibit auto-reload. See comments on setBufferDirty
+		textEditorPage.setBufferDirty(result);
 		return result;
 	}