From 0763359fb8b4274d7b4b7e959a8d1bd3752ded20 Mon Sep 17 00:00:00 2001
From: Vyacheslav Karpukhin <Vyacheslav.Karpukhin@jetbrains.com>
Date: Fri, 28 Mar 2014 19:18:43 +0400
Subject: [PATCH] Xcode keymap parent changed from "Mac OS X" to "Mac OS X
 10.5+"

---
 .../src/idea/Keymap_Xcode.xml                 | 111 ++----------------
 1 file changed, 8 insertions(+), 103 deletions(-)

diff --git a/platform/platform-resources/src/idea/Keymap_Xcode.xml b/platform/platform-resources/src/idea/Keymap_Xcode.xml
index 6f9e5245f9eb..6d7d124479b0 100644
--- a/platform/platform-resources/src/idea/Keymap_Xcode.xml
+++ b/platform/platform-resources/src/idea/Keymap_Xcode.xml
@@ -1,23 +1,5 @@
 <component>
-  <keymap version="1" name="Xcode" parent="Mac OS X">
-    <action id="$Delete">
-      <keyboard-shortcut first-keystroke="DELETE"/>
-      <keyboard-shortcut first-keystroke="BACK_SPACE"/>
-    </action>
-
-    <action id="EditorDelete">
-      <keyboard-shortcut first-keystroke="DELETE"/>
-    </action>
-
-    <action id="EditorBackSpace">
-      <keyboard-shortcut first-keystroke="BACK_SPACE"/>
-      <keyboard-shortcut first-keystroke="shift BACK_SPACE"/>
-    </action>
-
-    <action id="SafeDelete">
-      <keyboard-shortcut first-keystroke="meta DELETE"/>
-    </action>
-
+  <keymap version="1" name="Xcode" parent="Mac OS X 10.5+">
     <action id="ActivateFavoritesToolWindow"/>
     <action id="ActivateMessagesToolWindow">
       <keyboard-shortcut first-keystroke="meta 4" />
@@ -52,13 +34,9 @@
     <action id="CleanBuildFolder">
       <keyboard-shortcut first-keystroke="alt shift meta K"/>
     </action>
-    <action id="CloseContent">
-      <keyboard-shortcut first-keystroke="meta W"/>
-    </action>
     <action id="CloseProject">
       <keyboard-shortcut first-keystroke="meta alt W" />
     </action>
-    <action id="EditorChooseLookupItemDot"><keyboard-shortcut first-keystroke="control PERIOD"/></action>
     <action id="CodeCompletion">
       <keyboard-shortcut first-keystroke="control SPACE" />
       <keyboard-shortcut first-keystroke="F5" />
@@ -76,9 +54,6 @@
     <action id="Compare.SameVersion">
       <keyboard-shortcut first-keystroke="alt shift meta ENTER" />
     </action>
-    <action id="Console.History.Next" />
-    <action id="Console.History.Previous" />
-    <action id="Console.TableResult.Reload" />
     <action id="DecrementWindowHeight" />
     <action id="Diff.NextChange">
       <keyboard-shortcut first-keystroke="shift meta CLOSE_BRACKET" />
@@ -92,9 +67,6 @@
     <action id="EditorCodeBlockEndWithSelection" />
     <action id="EditorCodeBlockStart" />
     <action id="EditorCodeBlockStartWithSelection" />
-    <action id="EditorDeleteToWordEnd">
-      <keyboard-shortcut first-keystroke="alt DELETE" />
-    </action>
     <action id="EditorDeleteToWordEndInDifferentHumpsMode">
       <keyboard-shortcut first-keystroke="control DELETE" />
     </action>
@@ -126,16 +98,10 @@
     <action id="EditorLineStartWithSelection">
       <keyboard-shortcut first-keystroke="shift meta LEFT" />
     </action>
-    <action id="EditorNextWord">
-      <keyboard-shortcut first-keystroke="alt RIGHT" />
-    </action>
     <action id="EditorNextWordInDifferentHumpsMode">
       <keyboard-shortcut first-keystroke="control alt F" />
       <keyboard-shortcut first-keystroke="control RIGHT" />
     </action>
-    <action id="EditorNextWordWithSelection">
-      <keyboard-shortcut first-keystroke="shift alt RIGHT" />
-    </action>
     <action id="EditorNextWordInDifferentHumpsModeWithSelection">
       <keyboard-shortcut first-keystroke="shift control alt F" />
       <keyboard-shortcut first-keystroke="shift control RIGHT" />
@@ -153,16 +119,10 @@
       <keyboard-shortcut first-keystroke="PAGE_UP" />
       <keyboard-shortcut first-keystroke="alt PAGE_UP" />
     </action>
-    <action id="EditorPreviousWord">
-      <keyboard-shortcut first-keystroke="alt LEFT" />
-    </action>
     <action id="EditorPreviousWordInDifferentHumpsMode">
       <keyboard-shortcut first-keystroke="control alt B" />
       <keyboard-shortcut first-keystroke="control LEFT" />
     </action>
-    <action id="EditorPreviousWordWithSelection">
-      <keyboard-shortcut first-keystroke="shift alt LEFT" />
-    </action>
     <action id="EditorPreviousWordInDifferentHumpsModeWithSelection">
       <keyboard-shortcut first-keystroke="shift control alt B" />
       <keyboard-shortcut first-keystroke="shift control LEFT" />
@@ -170,24 +130,16 @@
     <action id="EditorScrollBottom">
       <keyboard-shortcut first-keystroke="END" />
     </action>
-    <action id="EditorScrollDown" />
     <action id="EditorScrollToCenter">
       <keyboard-shortcut first-keystroke="control L" />
     </action>
     <action id="EditorScrollTop">
       <keyboard-shortcut first-keystroke="HOME" />
     </action>
-    <action id="EditorScrollUp" />
-    <action id="EditorSelectWord">
-      <keyboard-shortcut first-keystroke="alt UP" />
-    </action>
     <action id="EditorSplitLine">
       <keyboard-shortcut first-keystroke="control O"/>
       <keyboard-shortcut first-keystroke="control ENTER"/>
     </action>
-    <action id="EditorUnSelectWord">
-      <keyboard-shortcut first-keystroke="alt DOWN"/>
-    </action>
     <action id="EditorTextEnd">
       <keyboard-shortcut first-keystroke="meta DOWN" />
       <keyboard-shortcut first-keystroke="meta END" />
@@ -229,9 +181,6 @@
     <action id="FileChooser.GotoHome" />
     <action id="FileChooser.GotoProject" />
     <action id="FileChooser.TogglePathShowing" />
-    <action id="FindInPath">
-      <keyboard-shortcut first-keystroke="shift meta F" />
-    </action>
     <action id="FindNext">
       <keyboard-shortcut first-keystroke="meta G" />
       <keyboard-shortcut first-keystroke="F3" />
@@ -245,10 +194,6 @@
       <keyboard-shortcut first-keystroke="alt F7" />
       <keyboard-shortcut first-keystroke="meta F7" />
     </action>
-    <action id="Generate">
-      <keyboard-shortcut first-keystroke="meta N"/>
-      <keyboard-shortcut first-keystroke="control ENTER"/>
-    </action>
     <action id="GotoDeclaration">
       <mouse-shortcut keystroke="meta button1" />
       <mouse-shortcut keystroke="button2" />
@@ -258,18 +203,12 @@
       <mouse-shortcut keystroke="meta alt button1" />
       <keyboard-shortcut first-keystroke="meta alt B" />
     </action>
-    <action id="GotoLine">
-      <keyboard-shortcut first-keystroke="meta L" />
-    </action>
     <action id="GotoNextError">
       <keyboard-shortcut first-keystroke="meta QUOTE" />
     </action>
     <action id="GotoPreviousError">
       <keyboard-shortcut first-keystroke="shift meta QUOTE" />
     </action>
-    <action id="GotoClass">
-      <keyboard-shortcut first-keystroke="meta O" />
-    </action>
     <action id="GotoFile">
       <keyboard-shortcut first-keystroke="meta alt O" />
     </action>
@@ -331,9 +270,6 @@
     <action id="OverrideMethods">
       <keyboard-shortcut first-keystroke="control meta O" />
     </action>
-    <action id="OptimizeImports">
-      <keyboard-shortcut first-keystroke="control alt O"/>
-    </action>
     <action id="ParameterInfo">
       <keyboard-shortcut first-keystroke="shift meta P" />
     </action>
@@ -345,8 +281,6 @@
     <action id="Print">
       <keyboard-shortcut first-keystroke="meta P" />
     </action>
-    <action id="ContextHelp">
-    </action>
     <action id="QuickJavaDoc">
       <keyboard-shortcut first-keystroke="shift control meta SLASH" />
       <keyboard-shortcut first-keystroke="F1" />
@@ -378,8 +312,8 @@
       <keyboard-shortcut first-keystroke="shift F10" />
     </action>
     <action id="RunClass">
-      <keyboard-shortcut first-keystroke="control shift F10"/>
       <keyboard-shortcut first-keystroke="control alt meta U"/>
+      <keyboard-shortcut first-keystroke="control shift F10"/>
     </action>
     <action id="RunToCursor">
       <keyboard-shortcut first-keystroke="control meta C"/>
@@ -431,10 +365,6 @@
     <action id="FileChooser.NewFolder">
       <keyboard-shortcut first-keystroke="alt INSERT" />
     </action>
-    <action id="NewElement">
-      <keyboard-shortcut first-keystroke="meta N" />
-      <keyboard-shortcut first-keystroke="control ENTER" />
-    </action>
     <action id="RecentFiles">
       <keyboard-shortcut first-keystroke="control 2" />
       <keyboard-shortcut first-keystroke="control 3" />
@@ -469,6 +399,9 @@
       <keyboard-shortcut first-keystroke="meta 7"/>
       <keyboard-shortcut first-keystroke="control shift F8"/>
     </action>
+    <action id="QuickImplementations">
+      <keyboard-shortcut first-keystroke="alt SPACE"/>
+    </action>
     <action id="XDebugger.MuteBreakpoints">
       <keyboard-shortcut first-keystroke="meta Y" />
     </action>
@@ -492,61 +425,33 @@
       <mouse-shortcut keystroke="button5"/>
     </action>
 
-    <action id="EditorCutLineEnd">
-      <keyboard-shortcut first-keystroke="control K" />
-    </action>
-    <action id="EditorDown">
-      <keyboard-shortcut first-keystroke="DOWN" />
-      <keyboard-shortcut first-keystroke="control N" />
-    </action>
     <action id="EditorDownWithSelection">
       <keyboard-shortcut first-keystroke="control shift N"/>
       <keyboard-shortcut first-keystroke="shift DOWN"/>
     </action>
-    <action id="EditorLeft">
-      <keyboard-shortcut first-keystroke="LEFT" />
-      <keyboard-shortcut first-keystroke="control B" />
-    </action>
     <action id="EditorLeftWithSelection">
       <keyboard-shortcut first-keystroke="shift LEFT"/>
       <keyboard-shortcut first-keystroke="shift control B"/>
     </action>
     <action id="EditorLineEnd">
-      <keyboard-shortcut first-keystroke="END" />
       <keyboard-shortcut first-keystroke="meta RIGHT" />
       <keyboard-shortcut first-keystroke="control E" />
     </action>
     <action id="EditorLineStart">
-      <keyboard-shortcut first-keystroke="HOME" />
       <keyboard-shortcut first-keystroke="meta LEFT" />
       <keyboard-shortcut first-keystroke="control A" />
     </action>
-    <action id="EditorRight">
-      <keyboard-shortcut first-keystroke="RIGHT" />
-      <keyboard-shortcut first-keystroke="control F" />
-    </action>
     <action id="EditorRightWithSelection">
       <keyboard-shortcut first-keystroke="shift RIGHT"/>
       <keyboard-shortcut first-keystroke="shift control F"/>
     </action>
-    <action id="EditorToggleColumnMode">
-      <keyboard-shortcut first-keystroke="shift meta 8" />
-    </action>
-    <action id="EditorUp">
-      <keyboard-shortcut first-keystroke="UP" />
-      <keyboard-shortcut first-keystroke="control P" />
-    </action>
     <action id="EditorUpWithSelection">
       <keyboard-shortcut first-keystroke="control shift P"/>
       <keyboard-shortcut first-keystroke="shift UP"/>
     </action>
 
-    <action id="UsageView.Include">
-      <keyboard-shortcut first-keystroke="shift BACK_SPACE"/>
-    </action>
-
-    <action id ="Refactorings.QuickListPopupAction">
-      <keyboard-shortcut first-keystroke="control T"/>
-    </action>
+    <action id="NewScratchFile"/>
+    <action id="ToggleBookmark"/>
+    <action id="FindUsagesInFile"/>
   </keymap>
 </component>