diff --git a/platform/platform-resources/src/idea/Keymap_Emacs.xml b/platform/platform-resources/src/idea/Keymap_Emacs.xml index 1278dc7ee5ea..e09c1752dcb1 100644 --- a/platform/platform-resources/src/idea/Keymap_Emacs.xml +++ b/platform/platform-resources/src/idea/Keymap_Emacs.xml @@ -215,9 +215,6 @@ - - - @@ -254,12 +251,6 @@ - - - - - - diff --git a/platform/testFramework/testSrc/com/intellij/openapi/keymap/KeymapsTestCase.java b/platform/testFramework/testSrc/com/intellij/openapi/keymap/KeymapsTestCase.java index 99ecd31ccac9..77bacf042d4e 100644 --- a/platform/testFramework/testSrc/com/intellij/openapi/keymap/KeymapsTestCase.java +++ b/platform/testFramework/testSrc/com/intellij/openapi/keymap/KeymapsTestCase.java @@ -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"},