MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-140616 Emacs keymap contains conflicting keybindings

Browse Source
This commit is contained in:
Dmitry Batrak
2015-05-23 16:26:23 +03:00
parent bfe9b725fd
commit 3b7a14ebf9
2 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-resources/src/idea/Keymap_Emacs.xml
-9
View File
@@ -215,9 +215,6 @@
<action id="CloseAllEditors">
<keyboard-shortcut first-keystroke="control X" second-keystroke="control C"/>
</action>
<action id="CloseAllEditorsButActive">
<keyboard-shortcut first-keystroke="control 1"/>
</action>
<action id="Find">
<keyboard-shortcut first-keystroke="control alt S"/>
<keyboard-shortcut first-keystroke="alt F3"/>
@@ -254,12 +251,6 @@
<action id="UnsplitAll">
<keyboard-shortcut first-keystroke="control X" second-keystroke="1" />
</action>
<action id="Unsplit">
<keyboard-shortcut first-keystroke="control 0"/>
</action>
<action id="ChangeSplitOrientation">
<keyboard-shortcut first-keystroke="control 5"/>
</action>
<action id="NextSplitter">
<keyboard-shortcut first-keystroke="control X" second-keystroke="O"/>
</action>
platform/testFramework/testSrc/com/intellij/openapi/keymap/KeymapsTestCase.java
+1 -3
View File
@@ -177,11 +177,9 @@ public abstract class KeymapsTestCase extends PlatformTestCase {
"EmacsStyleIndent", "NextTemplateParameter", "ExpandLiveTemplateByTab"},
{ "alt DOWN", "ShowContent", "MethodDown"},
{ "alt SLASH", "CodeCompletion", "HippieCompletion"},
{ "control 0", "Unsplit", "GotoBookmark0"},
{ "control 1", "CloseAllEditorsButActive", "FileChooser.GotoHome", "GotoBookmark1", "DuplicatesForm.SendToLeft"},
{ "control 1", "FileChooser.GotoHome", "GotoBookmark1", "DuplicatesForm.SendToLeft"},
{ "control 2", "FileChooser.GotoProject", "GotoBookmark2", "DuplicatesForm.SendToRight"},
{ "control 3", "GotoBookmark3", "FileChooser.GotoModule"},
{ "control 5", "ChangeSplitOrientation", "GotoBookmark5"},
{ "control D", "$Delete", "Diff.ShowDiff", "CompareTwoFiles", "SendEOF", "FileChooser.GotoDesktop"},
{ "control K", "EditorCutLineEnd", "CheckinProject"},
{ "control N", "EditorDown", "FileChooser.NewFolder"},