diff --git a/MacVim.xcodeproj/project.pbxproj b/MacVim.xcodeproj/project.pbxproj
index 11f241cae1..8e40b55e90 100644
--- a/MacVim.xcodeproj/project.pbxproj
+++ b/MacVim.xcodeproj/project.pbxproj
@@ -30,6 +30,7 @@
 		1D71ACBE0BC702AC002F2B60 /* doc-bm.icns in Resources */ = {isa = PBXBuildFile; fileRef = 1D71ACB30BC702AB002F2B60 /* doc-bm.icns */; };
 		1DD04DEC0C529C5E006CDC2B /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 1DD04DEB0C529C5E006CDC2B /* Credits.rtf */; };
 		1DD0C20C0C60FFB4008CD84A /* gvimrc in CopyFiles */ = {isa = PBXBuildFile; fileRef = 1DD0C20A0C60FF9A008CD84A /* gvimrc */; };
+		1DD66ECE0C803D3600EBDAB3 /* MMApplication.m in Sources */ = {isa = PBXBuildFile; fileRef = 1DD66ECC0C803D3600EBDAB3 /* MMApplication.m */; };
 		1DD703B90BA9D15D008679E9 /* vim_gloss.icns in Resources */ = {isa = PBXBuildFile; fileRef = 1DD703B80BA9D15D008679E9 /* vim_gloss.icns */; };
 		1DD704310BA9F9C2008679E9 /* SpecialKeys.plist in Resources */ = {isa = PBXBuildFile; fileRef = 1DD704300BA9F9C2008679E9 /* SpecialKeys.plist */; };
 		1DDBEB6D0C7434150036EEDD /* EmptyWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = 1DDBEB6B0C7434150036EEDD /* EmptyWindow.nib */; };
@@ -150,6 +151,8 @@
 		1D71ACB30BC702AB002F2B60 /* doc-bm.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = "doc-bm.icns"; sourceTree = "<group>"; };
 		1DD04DEB0C529C5E006CDC2B /* Credits.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; path = Credits.rtf; sourceTree = "<group>"; };
 		1DD0C20A0C60FF9A008CD84A /* gvimrc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = gvimrc; sourceTree = "<group>"; };
+		1DD66ECB0C803D3600EBDAB3 /* MMApplication.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MMApplication.h; sourceTree = "<group>"; };
+		1DD66ECC0C803D3600EBDAB3 /* MMApplication.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MMApplication.m; sourceTree = "<group>"; };
 		1DD703B80BA9D15D008679E9 /* vim_gloss.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = vim_gloss.icns; sourceTree = "<group>"; };
 		1DD704300BA9F9C2008679E9 /* SpecialKeys.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = SpecialKeys.plist; sourceTree = "<group>"; };
 		1DDBEB6C0C7434150036EEDD /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/EmptyWindow.nib; sourceTree = "<group>"; };
@@ -202,6 +205,8 @@
 		080E96DDFE201D6D7F000001 /* MacVim Source */ = {
 			isa = PBXGroup;
 			children = (
+				1DD66ECB0C803D3600EBDAB3 /* MMApplication.h */,
+				1DD66ECC0C803D3600EBDAB3 /* MMApplication.m */,
 				1D09AB3F0C6A4D520045497E /* MMTypesetter.h */,
 				1D09AB400C6A4D520045497E /* MMTypesetter.m */,
 				1D1474B90C567A910038FA2B /* MMWindowController.h */,
@@ -480,6 +485,7 @@
 				1D1474B60C56796D0038FA2B /* MMVimController.m in Sources */,
 				1D1474BC0C567A910038FA2B /* MMWindowController.m in Sources */,
 				1D09AB420C6A4D520045497E /* MMTypesetter.m in Sources */,
+				1DD66ECE0C803D3600EBDAB3 /* MMApplication.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/MacVim.xcodeproj/winckler.mode1 b/MacVim.xcodeproj/winckler.mode1
index df318deb0e..b402d34291 100644
--- a/MacVim.xcodeproj/winckler.mode1
+++ b/MacVim.xcodeproj/winckler.mode1
@@ -287,7 +287,7 @@
 							<real>186</real>
 						</array>
 						<key>RubberWindowFrame</key>
-						<string>168 348 690 397 0 0 1024 746 </string>
+						<string>165 349 690 397 0 0 1024 746 </string>
 					</dict>
 					<key>Module</key>
 					<string>PBXSmartGroupTreeModule</string>
@@ -324,7 +324,7 @@
 								<key>Frame</key>
 								<string>{{0, 0}, {482, 0}}</string>
 								<key>RubberWindowFrame</key>
-								<string>168 348 690 397 0 0 1024 746 </string>
+								<string>165 349 690 397 0 0 1024 746 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXNavigatorGroup</string>
@@ -344,7 +344,7 @@
 								<key>Frame</key>
 								<string>{{0, 5}, {482, 351}}</string>
 								<key>RubberWindowFrame</key>
-								<string>168 348 690 397 0 0 1024 746 </string>
+								<string>165 349 690 397 0 0 1024 746 </string>
 							</dict>
 							<key>Module</key>
 							<string>XCDetailModule</string>
@@ -368,9 +368,9 @@
 			</array>
 			<key>TableOfContents</key>
 			<array>
-				<string>1DE5E6960C75770B0027A2B1</string>
+				<string>1DFB82D80C80441E00085E92</string>
 				<string>1CE0B1FE06471DED0097A5F4</string>
-				<string>1DE5E6970C75770B0027A2B1</string>
+				<string>1DFB82D90C80441E00085E92</string>
 				<string>1CE0B20306471E060097A5F4</string>
 				<string>1CE0B20506471E060097A5F4</string>
 			</array>
@@ -507,7 +507,7 @@
 		<string>/Users/winckler/Projects/vim7/src/MacVim/MacVim.xcodeproj</string>
 	</array>
 	<key>WindowString</key>
-	<string>168 348 690 397 0 0 1024 746 </string>
+	<string>165 349 690 397 0 0 1024 746 </string>
 	<key>WindowTools</key>
 	<array>
 		<dict>
@@ -528,7 +528,7 @@
 								<key>PBXProjectModuleGUID</key>
 								<string>1CD0528F0623707200166675</string>
 								<key>PBXProjectModuleLabel</key>
-								<string>MMWindowController.m</string>
+								<string>MMApplication.m</string>
 								<key>StatusBarVisibility</key>
 								<true/>
 							</dict>
@@ -586,7 +586,7 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>1D16B9EF0BA33E3800A69B33</string>
-				<string>1DDBEB860C7438D80036EEDD</string>
+				<string>1DD66EA90C802F9300EBDAB3</string>
 				<string>1CD0528F0623707200166675</string>
 				<string>XCMainBuildResultsModuleGUID</string>
 			</array>
@@ -628,8 +628,8 @@
 										<string>yes</string>
 										<key>sizes</key>
 										<array>
-											<string>{{0, 0}, {391, 339}}</string>
-											<string>{{391, 0}, {633, 339}}</string>
+											<string>{{0, 0}, {378, 339}}</string>
+											<string>{{378, 0}, {646, 339}}</string>
 										</array>
 									</dict>
 									<key>VerticalSplitView</key>
@@ -692,14 +692,14 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>1CD10A99069EF8BA00B06720</string>
-				<string>1DDBEB9F0C743B2A0036EEDD</string>
+				<string>1DD66EAA0C802F9300EBDAB3</string>
 				<string>1C162984064C10D400B95A72</string>
-				<string>1DDBEBA00C743B2A0036EEDD</string>
-				<string>1DDBEBA10C743B2A0036EEDD</string>
-				<string>1DDBEBA20C743B2A0036EEDD</string>
-				<string>1DDBEBA30C743B2A0036EEDD</string>
-				<string>1DDBEBA40C743B2A0036EEDD</string>
-				<string>1DDBEBA50C743B2A0036EEDD</string>
+				<string>1DD66EAB0C802F9300EBDAB3</string>
+				<string>1DD66EAC0C802F9300EBDAB3</string>
+				<string>1DD66EAD0C802F9300EBDAB3</string>
+				<string>1DD66EAE0C802F9300EBDAB3</string>
+				<string>1DD66EAF0C802F9300EBDAB3</string>
+				<string>1DD66EB00C802F9300EBDAB3</string>
 			</array>
 			<key>ToolbarConfiguration</key>
 			<string>xcode.toolbar.config.debug</string>
@@ -840,7 +840,7 @@
 								<key>Frame</key>
 								<string>{{0, 0}, {836, 380}}</string>
 								<key>RubberWindowFrame</key>
-								<string>137 67 836 421 0 0 1024 746 </string>
+								<string>201 95 836 421 0 0 1024 746 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXDebugCLIModule</string>
@@ -863,11 +863,11 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>1DE444730BA4445100C4C77A</string>
-				<string>1DDBEBA60C743B2A0036EEDD</string>
+				<string>1DD66EB10C802F9300EBDAB3</string>
 				<string>1C78EAAC065D492600B07095</string>
 			</array>
 			<key>WindowString</key>
-			<string>137 67 836 421 0 0 1024 746 </string>
+			<string>201 95 836 421 0 0 1024 746 </string>
 			<key>WindowToolGUID</key>
 			<string>1DE444730BA4445100C4C77A</string>
 			<key>WindowToolIsVisible</key>
@@ -958,9 +958,9 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>1C0AD2B3069F1EA900FABCE6</string>
-				<string>1DDBEB870C7438D80036EEDD</string>
+				<string>1DD66EDD0C803D7000EBDAB3</string>
 				<string>1CD0528B0623707200166675</string>
-				<string>1DDBEB880C7438D80036EEDD</string>
+				<string>1DD66EDE0C803D7000EBDAB3</string>
 			</array>
 			<key>ToolbarConfiguration</key>
 			<string>xcode.toolbar.config.run</string>
@@ -1084,6 +1084,8 @@
 					<key>Dock</key>
 					<array>
 						<dict>
+							<key>BecomeActive</key>
+							<true/>
 							<key>ContentConfiguration</key>
 							<dict>
 								<key>PBXBottomSmartGroupGIDs</key>
@@ -1184,8 +1186,8 @@
 			<true/>
 			<key>TableOfContents</key>
 			<array>
-				<string>1D6F54660C733FF800D9BDC8</string>
-				<string>1D6F54670C733FF800D9BDC8</string>
+				<string>1DD66EC50C80374400EBDAB3</string>
+				<string>1DD66EC60C80374400EBDAB3</string>
 				<string>1CE0B1FE06471DED0097A5F4</string>
 				<string>1CA1AED706398EBD00589147</string>
 			</array>
@@ -1194,7 +1196,7 @@
 			<key>WindowString</key>
 			<string>135 179 744 409 0 0 1024 746 </string>
 			<key>WindowToolGUID</key>
-			<string>1D6F54660C733FF800D9BDC8</string>
+			<string>1DD66EC50C80374400EBDAB3</string>
 			<key>WindowToolIsVisible</key>
 			<false/>
 		</dict>
diff --git a/MacVim.xcodeproj/winckler.pbxuser b/MacVim.xcodeproj/winckler.pbxuser
index cee65d47b5..1a3d6a7dd5 100644
--- a/MacVim.xcodeproj/winckler.pbxuser
+++ b/MacVim.xcodeproj/winckler.pbxuser
@@ -25,9 +25,9 @@
 	};
 	1D14749E0C5673AE0038FA2B /* MMAppController.m */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {983, 7600}}";
-			sepNavSelRange = "{14399, 0}";
-			sepNavVisRect = "{{0, 4078}, {983, 274}}";
+			sepNavIntBoundsRect = "{{0, 0}, {795, 8864}}";
+			sepNavSelRange = "{17491, 0}";
+			sepNavVisRect = "{{0, 5415}, {795, 162}}";
 			sepNavWindowFrame = "{{15, 4}, {820, 737}}";
 		};
 	};
@@ -49,17 +49,17 @@
 	};
 	1D1474AE0C5678370038FA2B /* MMTextView.m */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {983, 7904}}";
-			sepNavSelRange = "{3174, 0}";
-			sepNavVisRect = "{{0, 1599}, {983, 274}}";
+			sepNavIntBoundsRect = "{{0, 0}, {781, 11504}}";
+			sepNavSelRange = "{18031, 7}";
+			sepNavVisRect = "{{0, 9245}, {781, 608}}";
 			sepNavWindowFrame = "{{15, 4}, {820, 737}}";
 		};
 	};
 	1D1474B40C56796D0038FA2B /* MMVimController.m */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1637, 17296}}";
-			sepNavSelRange = "{3790, 7}";
-			sepNavVisRect = "{{0, 1576}, {781, 608}}";
+			sepNavIntBoundsRect = "{{0, 0}, {1637, 19840}}";
+			sepNavSelRange = "{42712, 0}";
+			sepNavVisRect = "{{0, 13527}, {795, 162}}";
 			sepNavWindowFrame = "{{15, 4}, {820, 737}}";
 		};
 	};
@@ -73,9 +73,9 @@
 	};
 	1D1474BA0C567A910038FA2B /* MMWindowController.m */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1147, 20016}}";
-			sepNavSelRange = "{39888, 0}";
-			sepNavVisRect = "{{0, 2791}, {795, 162}}";
+			sepNavIntBoundsRect = "{{0, 0}, {1147, 19040}}";
+			sepNavSelRange = "{38061, 0}";
+			sepNavVisRect = "{{0, 15143}, {795, 162}}";
 			sepNavWindowFrame = "{{15, 4}, {820, 737}}";
 		};
 	};
@@ -99,13 +99,13 @@
 			NO,
 		);
 		argumentStrings = (
-			"-MMTextInsetLeft 2",
-			"-MMTextInsetRight 1",
-			"-MMTextInsetTop 1",
-			"-MMTextInsetBottom 1",
+			"-MMTextInsetLeft 10",
+			"-MMTextInsetRight 5",
+			"-MMTextInsetTop 10",
+			"-MMTextInsetBottom 5",
 			"-MMTabMaxWidth 384",
 			"-MMTabOptimumWidth 132",
-			"-MMStatuslineOff 1",
+			"-MMOpenFilesInTabs 1",
 			"-MMNoWindow 1",
 			"-MMTabMinWidth 32",
 			"-MMCellWidthMultiplier 1.414",
@@ -144,6 +144,11 @@
 				name = NSZombieEnabled;
 				value = YES;
 			},
+			{
+				active = NO;
+				name = NSObjCMessageLoggingEnabled;
+				value = YES;
+			},
 		);
 		executableSystemSymbolLevel = 0;
 		executableUserSymbolLevel = 0;
@@ -217,7 +222,7 @@
 		delayBeforeContinue = 0;
 		hitCount = 1;
 		location = AppKit;
-		modificationTime = 208946307.079667;
+		modificationTime = 209732042.802391;
 		state = 2;
 		symbolName = "[NSView performKeyEquivalent:]";
 	};
@@ -230,7 +235,7 @@
 		delayBeforeContinue = 0;
 		hitCount = 1;
 		location = Foundation;
-		modificationTime = 208946315.868945;
+		modificationTime = 209732047.262262;
 		state = 1;
 		symbolName = "-[_NSZombie methodSignatureForSelector:]";
 	};
@@ -243,10 +248,47 @@
 		delayBeforeContinue = 0;
 		hitCount = 1;
 		location = Foundation;
-		modificationTime = 208946315.819578;
+		modificationTime = 209732047.175895;
 		state = 1;
 		symbolName = "[NSException raise]";
 	};
+	1DD66EA30C802F2D00EBDAB3 /* MMTextView.m:594 */ = {
+		isa = PBXFileBreakpoint;
+		actions = (
+		);
+		breakpointStyle = 0;
+		continueAfterActions = 0;
+		delayBeforeContinue = 0;
+		fileReference = 1D1474AE0C5678370038FA2B /* MMTextView.m */;
+		functionName = "-keyDown:";
+		hitCount = 1;
+		lineNumber = 594;
+		location = MacVim;
+		modificationTime = 209732042.795645;
+		state = 2;
+	};
+	1DD66EB70C80301100EBDAB3 /* MMTextView.m:172 */ = {
+		isa = PBXFileBreakpoint;
+		actions = (
+		);
+		breakpointStyle = 0;
+		continueAfterActions = 0;
+		delayBeforeContinue = 0;
+		fileReference = 1D1474AE0C5678370038FA2B /* MMTextView.m */;
+		functionName = "-performKeyEquivalent:";
+		hitCount = 3;
+		lineNumber = 172;
+		location = MacVim;
+		modificationTime = 209732165.15915;
+		state = 2;
+	};
+	1DD66ECC0C803D3600EBDAB3 /* MMApplication.m */ = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {795, 736}}";
+			sepNavSelRange = "{1597, 0}";
+			sepNavVisRect = "{{0, 247}, {795, 162}}";
+		};
+	};
 	1DD704300BA9F9C2008679E9 /* SpecialKeys.plist */ = {
 		uiCtxt = {
 			sepNavIntBoundsRect = "{{0, 0}, {797, 1008}}";
@@ -262,6 +304,8 @@
 			1D9B9FEF0BB34E7700F878F2 /* [NSException raise] */,
 			1D6F54990C7358B600D9BDC8 /* [NSView performKeyEquivalent:] */,
 			1D6F54CB0C7371E000D9BDC8 /* -[_NSZombie methodSignatureForSelector:] */,
+			1DD66EA30C802F2D00EBDAB3 /* MMTextView.m:594 */,
+			1DD66EB70C80301100EBDAB3 /* MMTextView.m:172 */,
 		);
 	};
 	29B97313FDCFA39411CA2CEA /* Project object */ = {
@@ -275,6 +319,8 @@
 			1D9B9FEF0BB34E7700F878F2 /* [NSException raise] */,
 			1D6F54990C7358B600D9BDC8 /* [NSView performKeyEquivalent:] */,
 			1D6F54CB0C7371E000D9BDC8 /* -[_NSZombie methodSignatureForSelector:] */,
+			1DD66EA30C802F2D00EBDAB3 /* MMTextView.m:594 */,
+			1DD66EB70C80301100EBDAB3 /* MMTextView.m:172 */,
 		);
 		breakpointsGroup = 1DE445650BA493EC00C4C77A /* XCBreakpointsBucket */;
 		codeSenseManager = 1D16B9DE0BA33BB000A69B33 /* Code sense */;
@@ -392,8 +438,8 @@
 					PBXFileDataSource_Warnings_ColumnID,
 				);
 			};
-			PBXPerProjectTemplateStateSaveDate = 209024719;
-			PBXWorkspaceStateSaveDate = 209024719;
+			PBXPerProjectTemplateStateSaveDate = 209732622;
+			PBXWorkspaceStateSaveDate = 209732622;
 		};
 		sourceControlManager = 1D16B9DD0BA33BB000A69B33 /* Source Control */;
 		userBuildSettings = {