Merge r147875:147891 from trunk.main/2.2-rc

2009-12-08  Michael Hutchinson  <mhutchinson@novell.com>

	* MonoDevelop.SourceEditor/SourceEditorView.cs: Check that
	  file exists before getting its old attributes.

2009-12-08  Michael Hutchinson  <mhutchinson@novell.com>

	* MacUpdater.cs: Add the updateinfo for MonoTouch source.

2009-12-08  Levi Bard  <taktaktaktaktaktaktaktaktaktak@gmail.com>

	* Mono.TextEditor.Vi/ViMode.cs: Add Ctrl-[ as a workalike for
	  Esc, Ctrl-C.


svn path=/branches/monodevelop/main/2.2/; revision=147895

6 files changed, 24 insertions, 7 deletions

diff --git a/main/src/addins/MacPlatform/ChangeLog b/main/src/addins/MacPlatform/ChangeLog
index 0a8a032980..4e8f87eb8a 100644
--- a/main/src/addins/MacPlatform/ChangeLog
+++ b/main/src/addins/MacPlatform/ChangeLog
@@ -1,3 +1,7 @@
+2009-12-08  Michael Hutchinson  <mhutchinson@novell.com>
+
+	* MacUpdater.cs: Add the updateinfo for MonoTouch source.
+
 2009-12-03  Michael Hutchinson  <mhutchinson@novell.com>
 
 	* MacPlatform.cs:
diff --git a/main/src/addins/MacPlatform/MacUpdater.cs b/main/src/addins/MacPlatform/MacUpdater.cs
index d70c3e3570..9cf8a1be22 100644
--- a/main/src/addins/MacPlatform/MacUpdater.cs
+++ b/main/src/addins/MacPlatform/MacUpdater.cs
@@ -49,6 +49,7 @@ namespace MonoDevelop.Platform
 				if (updateInfos == null) {
 					var files = new string[] {
 						"/Developer/MonoTouch/updateinfo",
+						"/Developer/MonoTouch/Source/updateinfo",
 						"/Library/Frameworks/Mono.framework/Versions/Current/updateinfo",
 						"/Library/Frameworks/Mono.framework/Versions/Current/updateinfo.csdk",
 						Path.GetDirectoryName (typeof (MacPlatform).Assembly.Location) + "/../../../updateinfo",
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/ChangeLog b/main/src/addins/MonoDevelop.SourceEditor2/ChangeLog
index 82626057b8..715344c3a6 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/ChangeLog
+++ b/main/src/addins/MonoDevelop.SourceEditor2/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-08  Michael Hutchinson  <mhutchinson@novell.com>
+
+	* MonoDevelop.SourceEditor/SourceEditorView.cs: Check that
+	  file exists before getting its old attributes.
+
 2009-12-02  Mike Krüger  <mkrueger@novell.com>
 
 	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Fixed 'Bug
@@ -2280,13 +2285,11 @@
 	  MonoDevelop.SourceEditor/SourceEditorView.cs: Worked on code
 	  completion/new dom.
 
-=======
 2008-07-28  Lluis Sanchez Gual <lluis@novell.com> 
 
 	* MonoDevelop.SourceEditor/SourceEditorView.cs: Don't escape file names
 	  for VFS here. It is done in the platform service.
 
->>>>>>> .merge-right.r109767
 2008-07-16  Lluis Sanchez Gual <lluis@novell.com> 
 
 	* MonoDevelop.SourceEditor/DebugValueWindow.cs: Make sure no rows are
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs
index 4b5e4e8bbb..603c4d65c8 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs
@@ -255,10 +255,12 @@ namespace MonoDevelop.SourceEditor
 			isInWrite = true;
 			try {
 				object attributes = null;
-				try {
-					attributes = DesktopService.GetFileAttributes (fileName);
-				} catch (Exception e) {
-					LoggingService.LogWarning ("Can't get file attributes", e);
+				if (File.Exists (fileName)) {
+					try {
+						attributes = DesktopService.GetFileAttributes (fileName);
+					} catch (Exception e) {
+						LoggingService.LogWarning ("Can't get file attributes", e);
+					}
 				}
 
 				TextFile.WriteFile (fileName, Document.Text, encoding);
diff --git a/main/src/core/Mono.Texteditor/ChangeLog b/main/src/core/Mono.Texteditor/ChangeLog
index 168803c659..bb063b28e1 100644
--- a/main/src/core/Mono.Texteditor/ChangeLog
+++ b/main/src/core/Mono.Texteditor/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-08  Levi Bard  <taktaktaktaktaktaktaktaktaktak@gmail.com>
+
+	* Mono.TextEditor.Vi/ViMode.cs: Add Ctrl-[ as a workalike for
+	  Esc, Ctrl-C.
+
 2009-12-02  Michael Hutchinson  <mhutchinson@novell.com>
 
 	* Mono.TextEditor.Highlighting/SyntaxModeService.cs: Name
diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor.Vi/ViMode.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor.Vi/ViMode.cs
index 0385853a75..dd81e3be61 100644
--- a/main/src/core/Mono.Texteditor/Mono.TextEditor.Vi/ViMode.cs
+++ b/main/src/core/Mono.Texteditor/Mono.TextEditor.Vi/ViMode.cs
@@ -160,7 +160,9 @@ namespace Mono.TextEditor.Vi
 		
 		protected override void HandleKeypress (Gdk.Key key, uint unicodeKey, Gdk.ModifierType modifier)
 		{
-			if (key == Gdk.Key.Escape || (key == Gdk.Key.c && (modifier & Gdk.ModifierType.ControlMask) != 0)) {
+			// Reset on Esc, Ctrl-C, Ctrl-[
+			if (key == Gdk.Key.Escape || 
+			    ((key == Gdk.Key.c || key == Gdk.Key.bracketleft) && (modifier & Gdk.ModifierType.ControlMask) != 0)) {
 				Reset (string.Empty);
 				return;
 			}