Snapshot 30

Window cycling is hardcoded to happen when the Cmd key is pressed with
the key whose keycode = 50.  Having window cycling in the "Window" menu
means that window cycling stops working when the keyboard layout is
changed.  Thus revert back to the old way of dealing with this since it
seems to work better.

src/MacVim/Info.plist

@@ -574,7 +574,7 @@
 	<key>CFBundleSignature</key>
 	<string>VIMM</string>
 	<key>CFBundleVersion</key>
-	<string>29</string>
+	<string>30</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>

src/MacVim/MMAtsuiTextView.m

@@ -406,6 +406,12 @@ enum {
             && !(116 == [event keyCode] || 121 == [event keyCode]))
         return NO;
 
+    // HACK!  KeyCode 50 represent the key which switches between windows
+    // within an application (like Cmd+Tab is used to switch between
+    // applications).  Return NO here, else the window switching does not work.
+    if ([event keyCode] == 50)
+        return NO;
+
     // HACK!  Let the main menu try to handle any key down event, before
     // passing it on to vim, otherwise key equivalents for menus will
     // effectively be disabled.

src/MacVim/MMTextView.m

@@ -640,6 +640,12 @@ enum {
             && !(116 == [event keyCode] || 121 == [event keyCode]))
         return NO;
 
+    // HACK!  KeyCode 50 represent the key which switches between windows
+    // within an application (like Cmd+Tab is used to switch between
+    // applications).  Return NO here, else the window switching does not work.
+    if ([event keyCode] == 50)
+        return NO;
+
     // HACK!  Let the main menu try to handle any key down event, before
     // passing it on to vim, otherwise key equivalents for menus will
     // effectively be disabled.

src/MacVim/MacVim.xcodeproj/project.pbxproj

@@ -698,7 +698,7 @@
 					i386,
 				);
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 29;
+				CURRENT_PROJECT_VERSION = 30;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)",
@@ -739,7 +739,7 @@
 			buildSettings = {
 				ARCHS = "$(NATIVE_ARCH)";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 29;
+				CURRENT_PROJECT_VERSION = 30;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)",
@@ -770,7 +770,7 @@
 			buildSettings = {
 				ARCHS = "$(NATIVE_ARCH)";
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 29;
+				CURRENT_PROJECT_VERSION = 30;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)",

src/MacVim/gvimrc

@@ -83,8 +83,6 @@ an <silent> 9900.301 Window.Minimize\ All       <Nop>
 an <silent> 9900.310 Window.Zoom                <Nop>
 an <silent> 9900.311 Window.Zoom\ All           <Nop>
 an <silent> 9900.320 Window.Toggle\ Full\ Screen\ Mode  :set invfullscreen<CR>
-an <silent> 9900.325 Window.Cycle\ Through\ Windows             <Nop>
-an <silent> 9900.326 Window.Cycle\ Backwards\ Through\ Windows  <Nop>
 an 9900.330 Window.-SEP1-                       <Nop>
 " TODO! Grey out if no tabs are visible.
 an <silent> 9900.340 Window.Previous\ Tab       :tabprevious<CR>
@@ -244,8 +242,6 @@ macm Window.Minimize\ All   key=<D-M-m>     action=miniaturizeAll:  alt=YES
 macm Window.Zoom            key=<D-C-z>     action=performZoom:
 macm Window.Zoom\ All       key=<D-M-C-z>   action=zoomAll:         alt=YES
 macm Window.Toggle\ Full\ Screen\ Mode  key=<D-F>
-macm Window.Cycle\ Through\ Windows     key=<D-`>   action=_cycleWindows:
-macm Window.Cycle\ Backwards\ Through\ Windows  key=<D-S-`> action=_cycleWindowsBackwards: alt=YES
 macm Window.Previous\ Tab               key=<D-{>
 macm Window.Next\ Tab                   key=<D-}>
 macm Window.Bring\ All\ To\ Front       action=arrangeInFront:

src/MacVim/macvim_latest.xml

@@ -41,17 +41,15 @@
     -->
     
     <item>
-      <title>Snapshot 29 released</title>
+      <title>Snapshot 30 released</title>
       <description><![CDATA[
-<h1>MacVim snapshot 29 released</h1>
+<h1>MacVim snapshot 30 released</h1>
 <p> Changes since snapshot 28:
 <ul>
   <li> copy&paste and other "Edit" menu items now work as expected with dialogs
        (such as open/save). </li>
   <li> some menus (such as the "Window" menu) has got some new items </li>
   <li> general menu improvements when no editor window is open </li>
-  <li> window-cycling key Cmd-` is no longer hard-coded and can be changed with
-       :macmenu command </li>
   <li> ability to access some OS X default Cmd-keys even if menus are
        completely altered (e.g. when starting with "-u NONE") </li>
   <li> QuickLook works with .vim files (patch by Nico Weber) </li>
@@ -65,12 +63,14 @@
   <li> latest vim patches and runtime files </li>
 </ul>
 </p>
+<p> The only difference between snapshot 29 and 30 is that the former did not
+handle window cycling very well with international keyboard layouts. </p>
       ]]></description>
-      <pubDate>Sun, 7 Jun 2008 12:57 CET</pubDate>
+      <pubDate>Sun, 8 Jun 2008 16:43 CET</pubDate>
       <enclosure type="application/octet-stream"
-        url="http://macvim.googlecode.com/files/MacVim-snapshot-29.tbz"
-        length="8137324"
-        sparkle:version="29"
+        url="http://macvim.googlecode.com/files/MacVim-snapshot-30.tbz"
+        length="8137308"
+        sparkle:version="30"
         sparkle:shortVersionString="7.1"
         />
     </item>