From f0cfaa276175e82086c263af9a8aa32fc392f7fb Mon Sep 17 00:00:00 2001
From: Alexander Kirillin <Alexander.Kirillin@jetbrains.com>
Date: Mon, 22 Apr 2013 19:51:53 +0400
Subject: [PATCH] OC-7210 Improve Xcode keymap

---
 .../platform-resources/src/idea/Keymap_Xcode.xml   | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/platform/platform-resources/src/idea/Keymap_Xcode.xml b/platform/platform-resources/src/idea/Keymap_Xcode.xml
index 5c0668e1aefc..9d62243fceab 100644
--- a/platform/platform-resources/src/idea/Keymap_Xcode.xml
+++ b/platform/platform-resources/src/idea/Keymap_Xcode.xml
@@ -79,13 +79,17 @@
     <action id="EditorCodeBlockStartWithSelection" />
     <action id="EditorDeleteToWordEnd">
       <keyboard-shortcut first-keystroke="alt DELETE" />
+    </action>
+    <action id="EditorDeleteToWordEndInDifferentHumpsMode">
       <keyboard-shortcut first-keystroke="control DELETE" />
     </action>
     <action id="EditorDeleteToWordStart">
       <keyboard-shortcut first-keystroke="alt BACK_SPACE" />
-      <keyboard-shortcut first-keystroke="control BACK_SPACE" />
       <keyboard-shortcut first-keystroke="control alt BACK_SPACE" />
     </action>
+    <action id="EditorDeleteToWordStartInDifferentHumpsMode">
+      <keyboard-shortcut first-keystroke="control BACK_SPACE" />
+    </action>
     <action id="EditorIndentSelection">
       <keyboard-shortcut first-keystroke="TAB" />
       <keyboard-shortcut first-keystroke="meta CLOSE_BRACKET" />
@@ -104,10 +108,14 @@
     </action>
     <action id="EditorNextWord">
       <keyboard-shortcut first-keystroke="alt RIGHT" />
+    </action>
+    <action id="EditorNextWordInDifferentHumpsMode">
       <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" />
     </action>
@@ -122,10 +130,14 @@
     </action>
     <action id="EditorPreviousWord">
       <keyboard-shortcut first-keystroke="alt LEFT" />
+    </action>
+    <action id="EditorPreviousWordInDifferentHumpsMode">
       <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" />
     </action>