diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionProgressIndicator.java b/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionProgressIndicator.java
index 1a2433772062..c24fb9c1f6d0 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionProgressIndicator.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionProgressIndicator.java
@@ -185,12 +185,6 @@ public class CompletionProgressIndicator extends ProgressIndicatorBase implement
myLookup.setFocusDegree(LookupImpl.FocusDegree.FOCUSED);
}
}
- else if (FeatureUsageTracker.getInstance()
- .isToBeAdvertisedInLookup(CodeCompletionFeatures.EDITING_COMPLETION_CONTROL_ENTER, getProject())) {
- myLookup.addAdvertisement("Press " +
- CompletionContributor.getActionShortcut(IdeActions.ACTION_CHOOSE_LOOKUP_ITEM_ALWAYS) +
- " to choose the selected (or first) suggestion", null);
- }
if (!myEditor.isOneLineMode() &&
FeatureUsageTracker.getInstance()
.isToBeAdvertisedInLookup(CodeCompletionFeatures.EDITING_COMPLETION_CONTROL_ARROWS, getProject())) {
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/actions/ChooseItemAction.java b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/actions/ChooseItemAction.java
index 9bcf2de2b9dd..903f2cb88f30 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/actions/ChooseItemAction.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/actions/ChooseItemAction.java
@@ -153,11 +153,6 @@ public abstract class ChooseItemAction extends EditorAction {
return liveTemplateLookup.getTemplateShortcut() == shortcutChar;
}
- public static class Always extends ChooseItemAction {
- public Always() {
- super(new Handler(false, Lookup.NORMAL_SELECT_CHAR));
- }
- }
public static class FocusedOnly extends ChooseItemAction {
public FocusedOnly() {
super(new Handler(true, Lookup.NORMAL_SELECT_CHAR));
diff --git a/platform/platform-api/src/com/intellij/openapi/actionSystem/IdeActions.java b/platform/platform-api/src/com/intellij/openapi/actionSystem/IdeActions.java
index 7cac10645629..d4ac053e994e 100644
--- a/platform/platform-api/src/com/intellij/openapi/actionSystem/IdeActions.java
+++ b/platform/platform-api/src/com/intellij/openapi/actionSystem/IdeActions.java
@@ -74,7 +74,6 @@ public interface IdeActions {
@NonNls String ACTION_HIPPIE_COMPLETION = "HippieCompletion";
@NonNls String ACTION_HIPPIE_BACKWARD_COMPLETION = "HippieBackwardCompletion";
@NonNls String ACTION_CHOOSE_LOOKUP_ITEM = "EditorChooseLookupItem";
- @NonNls String ACTION_CHOOSE_LOOKUP_ITEM_ALWAYS = "EditorChooseLookupItemAlways";
@NonNls String ACTION_CHOOSE_LOOKUP_ITEM_REPLACE = "EditorChooseLookupItemReplace";
@NonNls String ACTION_CHOOSE_LOOKUP_ITEM_COMPLETE_STATEMENT = "EditorChooseLookupItemCompleteStatement";
@NonNls String ACTION_CHOOSE_LOOKUP_ITEM_DOT = "EditorChooseLookupItemDot";
diff --git a/platform/platform-resources-en/src/tips/FinishByControlEnter.html b/platform/platform-resources-en/src/tips/FinishByControlEnter.html
deleted file mode 100644
index 28a907d7d3e5..000000000000
--- a/platform/platform-resources-en/src/tips/FinishByControlEnter.html
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
- &shortcut:EditorChooseLookupItemAlways; will
-choose the first item of the autopopup completion when there is no selection there.
-
-
diff --git a/platform/platform-resources/src/idea/Keymap_Default.xml b/platform/platform-resources/src/idea/Keymap_Default.xml
index 3d725e379343..d413f715e018 100644
--- a/platform/platform-resources/src/idea/Keymap_Default.xml
+++ b/platform/platform-resources/src/idea/Keymap_Default.xml
@@ -675,9 +675,6 @@
-
-
-
diff --git a/platform/platform-resources/src/idea/Keymap_Mac.xml b/platform/platform-resources/src/idea/Keymap_Mac.xml
index d41249b0d03f..9c60daf64c16 100644
--- a/platform/platform-resources/src/idea/Keymap_Mac.xml
+++ b/platform/platform-resources/src/idea/Keymap_Mac.xml
@@ -313,10 +313,6 @@
-
-
-
-
diff --git a/platform/platform-resources/src/idea/Keymap_MacClassic.xml b/platform/platform-resources/src/idea/Keymap_MacClassic.xml
index 9baf026dd6ca..b21873452afc 100644
--- a/platform/platform-resources/src/idea/Keymap_MacClassic.xml
+++ b/platform/platform-resources/src/idea/Keymap_MacClassic.xml
@@ -87,10 +87,6 @@
-
-
-
-
diff --git a/platform/platform-resources/src/idea/PlatformLangActionManager.xml b/platform/platform-resources/src/idea/PlatformLangActionManager.xml
index 7452b9ca1664..a8374eb3b1e6 100644
--- a/platform/platform-resources/src/idea/PlatformLangActionManager.xml
+++ b/platform/platform-resources/src/idea/PlatformLangActionManager.xml
@@ -3,7 +3,6 @@
-
diff --git a/python/resources/ProductivityFeaturesRegistry.xml b/python/resources/ProductivityFeaturesRegistry.xml
index 58030932f350..2910dc26b475 100644
--- a/python/resources/ProductivityFeaturesRegistry.xml
+++ b/python/resources/ProductivityFeaturesRegistry.xml
@@ -115,12 +115,6 @@
first-show="5"
successive-show="7"
/>
-
-
-
-
-
-
- &shortcut:EditorChooseLookupItemAlways; will
-choose the first item of the autopopup completion when there is no selection there.
-
-