From 1cd447d722cd29ea525f158f3ae63877a3dff4a3 Mon Sep 17 00:00:00 2001
From: "Denis.Zhdanov" <Denis.Zhdanov@jetbrains.com>
Date: Fri, 14 Sep 2012 18:02:39 +0400
Subject: [PATCH] IDEA-91493 Conflict shortcut in Emacs keymap of "comment" and
 "undo"

---
 platform/platform-resources/src/idea/Keymap_Emacs.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/platform/platform-resources/src/idea/Keymap_Emacs.xml b/platform/platform-resources/src/idea/Keymap_Emacs.xml
index 5f0ff589a373..730826c46f5a 100644
--- a/platform/platform-resources/src/idea/Keymap_Emacs.xml
+++ b/platform/platform-resources/src/idea/Keymap_Emacs.xml
@@ -268,6 +268,9 @@
     <action id="NextProjectWindow">
       <keyboard-shortcut first-keystroke="control X" second-keystroke="control O"/>
     </action>
+    <action id="CommentByLineComment">
+      <keyboard-shortcut first-keystroke="alt SEMICOLON"/>
+    </action>
     
     <!--Disabled shortcuts-->
     <action id="CollapseAllRegions"/>
@@ -279,6 +282,7 @@
     <action id="IntroduceField"/>
     <action id="RecentFiles"/>
     <action id="EditorTab"/>
+    <action id="EditorDeleteLine"/>
     <action id="PreviousProjectWindow"/>
     <action id="Vcs.ShowMessageHistory"/>
     <action id="GotoImplementation"/>