From a3258e2d4762bc77487d68226167fbc327b20244 Mon Sep 17 00:00:00 2001
From: Alexander Zolotov <Alexander.Zolotov@jetbrains.com>
Date: Thu, 27 Feb 2014 18:47:12 +0400
Subject: [PATCH] IDEA-121283 Multiple Carets: Alt-J keyboard shortcut should
 be changed for Mac

---
 platform/platform-resources/src/idea/Keymap_Mac.xml        | 7 +++++++
 platform/platform-resources/src/idea/Keymap_MacClassic.xml | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/platform/platform-resources/src/idea/Keymap_Mac.xml b/platform/platform-resources/src/idea/Keymap_Mac.xml
index 42cf466cd85b..044d5b91c7c7 100644
--- a/platform/platform-resources/src/idea/Keymap_Mac.xml
+++ b/platform/platform-resources/src/idea/Keymap_Mac.xml
@@ -349,6 +349,13 @@
     <action id="FindPrevious">
       <keyboard-shortcut first-keystroke="meta shift G"/>
     </action>
+    
+    <action id="SelectNextOccurrence">
+      <keyboard-shortcut first-keystroke="control G"/>
+    </action>
+    <action id="UnselectLastOccurrence">
+      <keyboard-shortcut first-keystroke="control shift G"/>
+    </action>
 
     <action id="Run">
       <keyboard-shortcut first-keystroke="control R"/>
diff --git a/platform/platform-resources/src/idea/Keymap_MacClassic.xml b/platform/platform-resources/src/idea/Keymap_MacClassic.xml
index 1ce8e72fa7bc..9d2b440f2797 100644
--- a/platform/platform-resources/src/idea/Keymap_MacClassic.xml
+++ b/platform/platform-resources/src/idea/Keymap_MacClassic.xml
@@ -258,6 +258,13 @@
       <keyboard-shortcut first-keystroke="shift F3"/>
       <keyboard-shortcut first-keystroke="control shift L"/>
     </action>
+    
+    <action id="SelectNextOccurrence">
+      <keyboard-shortcut first-keystroke="control G"/>
+    </action>
+    <action id="UnselectLastOccurrence">
+      <keyboard-shortcut first-keystroke="control shift G"/>
+    </action>
 
     <action id="VcsShowNextChangeMarker">
       <keyboard-shortcut first-keystroke="shift control alt DOWN"/>