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, 5 insertions, 2 deletions

diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/Change.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/Change.cs
index f63f5264ba..9d3d06558c 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/Change.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/Change.cs
@@ -85,13 +85,16 @@ namespace MonoDevelop.Refactoring
 		}
 		
 		static List<TextEditorData> textEditorDatas = new List<TextEditorData> ();
+		static List<IDisposable> undoGroups = new List<IDisposable> ();
+		
 		public static void FinishRefactoringOperation ()
 		{
 			foreach (TextEditorData data in textEditorDatas) {
-				data.Document.EndAtomicUndo ();
 				data.Document.CommitUpdateAll ();
 			}
 			textEditorDatas.Clear ();
+			undoGroups.ForEach (grp => grp.Dispose ());
+			undoGroups.Clear ();
 		}
 		
 		internal static TextEditorData GetTextEditorData (string fileName)
@@ -103,7 +106,7 @@ namespace MonoDevelop.Refactoring
 					TextEditorData result = doc.Editor;
 					if (result != null) {
 						textEditorDatas.Add (result);
-						result.Document.BeginAtomicUndo ();
+						undoGroups.Add (result.OpenUndoGroup ());
 						return result;
 					}
 				}