Merge branch 'master' into newresolver

Conflicts:
	main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs
	main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/MemberCompletionData.cs
	main/src/addins/MonoDevelop.MacDev/ObjCIntegration/NSObjectInfoService.cs

1 files changed, 21 insertions, 8 deletions

diff --git a/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor/HexEditorView.cs b/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor/HexEditorView.cs
index 808c545a80..8be5c0675f 100644
--- a/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor/HexEditorView.cs
+++ b/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor/HexEditorView.cs
@@ -94,19 +94,32 @@ namespace MonoDevelop.HexEditor
 			hexEditor.HexEditorData.Redo ();
 		}
 		
-		
-		void IUndoHandler.BeginAtomicUndo ()
+		class UndoGroup : IDisposable
 		{
-			hexEditor.HexEditorData.BeginAtomicUndo ();
-		}
-		
+			HexEditorData data;
+			
+			public UndoGroup (HexEditorData data)
+			{
+				if (data == null)
+					throw new ArgumentNullException ("data");
+				this.data = data;
+				data.BeginAtomicUndo ();
+			}
+			
+			public void Dispose ()
+			{
+				if (data != null) {
+					data.EndAtomicUndo ();
+					data = null;
+				}
+			}
+		}	
 		
-		void IUndoHandler.EndAtomicUndo ()
+		IDisposable IUndoHandler.OpenUndoGroup ()
 		{
-			hexEditor.HexEditorData.EndAtomicUndo ();
+			return new UndoGroup (hexEditor.HexEditorData);
 		}
 		
-		
 		bool IUndoHandler.EnableUndo {
 			get {
 				return hexEditor.HexEditorData.EnableUndo;