Snapshot 49

Fix Ctrl-h, Ctrl-@ and Ctrl-o regression.  Also remove all key bindings
involving arrays from KeyBinding.dict.

src/MacVim/Info.plist

@@ -1201,7 +1201,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>48</string>
+	<string>49</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>

src/MacVim/KeyBinding.plist

@@ -150,11 +150,11 @@
 	<string>deleteBackward:</string>
 	<key>^k</key>
 	<string>deleteToEndOfParagraph:</string>
-	<key>^l</key>
+	<key>^l</key>
 	<string>centerSelectionInVisibleArea:</string>
 	<key>^n</key>
 	<string>moveDown:</string>
-	<key>^o</key>
+        <!-- <key>^o</key>
 	<array>
 		<string>insertNewlineIgnoringFieldEditor:</string>
 		<string>moveBackward:</string>
@@ -370,7 +370,7 @@
 	<key>^</key>
 	<string>moveToBeginningOfLine:</string>
 	<key>^</key>
-	<string>moveToEndOfLine:</string>
+	<string>moveToEndOfLine:</string>
 	<key>^$</key>
 	<string>moveToBeginningOfLineAndModifySelection:</string>
 	<key>^$</key>
@@ -379,7 +379,7 @@
 	<array>
 		<string>moveBackward:</string>
 		<string>moveToBeginningOfParagraph:</string>
-	</array>
+	</array>
 	<key>~</key>
 	<array>
 		<string>moveForward:</string>

src/MacVim/MMBackend.m

@@ -1135,7 +1135,8 @@ extern GuiFont gui_mch_retain_font(GuiFont font);
         if (1 == len) {
             char_u *str = (char_u*)bytes;
             if ((str[0] == Ctrl_C && ctrl_c_interrupts) ||
-                    (str[0] == intr_char && intr_char != Ctrl_C)) {
+                    (str[0] == intr_char && intr_char != 0)) {
+                ASLogDebug(@"Got INT, str[0]=%#x", str[0]);
                 got_int = TRUE;
                 [inputQueue removeAllObjects];
                 return;

src/MacVim/MMTextViewHelper.m

@@ -251,7 +251,7 @@ KeyboardInputSourcesEqual(TISInputSourceRef a, TISInputSourceRef b)
              @selector(deleteWordBackward:) == sel ||
              @selector(deleteBackwardByDecomposingPreviousCharacter:) == sel ||
              @selector(deleteToBeginningOfLine:) == sel)
-        [self doKeyDown:@"\x7f"];
+        [self doKeyDown:@"\x08"];
     else if (@selector(keySpace:) == sel)
         [self doKeyDown:@" "];
     else if (@selector(cancel:) == sel)
@@ -262,6 +262,8 @@ KeyboardInputSourcesEqual(TISInputSourceRef a, TISInputSourceRef b)
 - (BOOL)performKeyEquivalent:(NSEvent *)event
 {
     ASLogDebug(@"");
+    if ([event type] != NSKeyDown)
+        return NO;
 
     // NOTE: Key equivalent handling was fixed in Leopard.  That is, an
     // unhandled key equivalent is passed to keyDown: -- contrast this with

src/MacVim/MacVim.xcodeproj/project.pbxproj

@@ -737,7 +737,7 @@
 					i386,
 				);
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 48;
+				CURRENT_PROJECT_VERSION = 49;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)",
@@ -778,7 +778,7 @@
 			buildSettings = {
 				ARCHS = "$(NATIVE_ARCH)";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 48;
+				CURRENT_PROJECT_VERSION = 49;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)",
@@ -810,7 +810,7 @@
 			buildSettings = {
 				ARCHS = "$(NATIVE_ARCH)";
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 48;
+				CURRENT_PROJECT_VERSION = 49;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)",

src/MacVim/macvim_latest.xml

@@ -41,9 +41,9 @@
     -->
 
     <item>
-      <title>Snapshot 48 released</title>
+      <title>Snapshot 49 released</title>
       <description><![CDATA[
-<h1>MacVim snapshot 48 released</h1>
+<h1>MacVim snapshot 49 released</h1>
 
 <p> Changes since snapshot 47:
   <ul>
@@ -58,11 +58,11 @@
   </ul>
 </p>
       ]]></description>
-      <pubDate>Sat, 15 Aug 2009 00:27 CET</pubDate>
+      <pubDate>Sun, 16 Aug 2009 01:17 CET</pubDate>
       <enclosure type="application/octet-stream"
-        url="http://newmacvim.muskokamug.org/mirror/files/MacVim-snapshot-48.tbz"
-        length="8212911"
-        sparkle:version="48"
+        url="http://newmacvim.muskokamug.org/mirror/files/MacVim-snapshot-49.tbz"
+        length="8212194"
+        sparkle:version="49"
         sparkle:shortVersionString="7.2"
         />
     </item>