diff --git a/debug/org.eclipse.cdt.debug.ui/ChangeLog b/debug/org.eclipse.cdt.debug.ui/ChangeLog
index 2978c1d3650..68a06e4ce50 100644
--- a/debug/org.eclipse.cdt.debug.ui/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.ui/ChangeLog
@@ -1,3 +1,7 @@
+2004-04-02 Mikhail Khodjaiants
+	Fix for bug 57160: Don't override Debug perspective's "autoClose" behavior.
+	* plugin.xml
+
 2004-04-02 Mikhail Khodjaiants
 	Fix for bug 57159: Don't add C views to Debug perspective by default.
 	* plugin.xml
diff --git a/debug/org.eclipse.cdt.debug.ui/plugin.xml b/debug/org.eclipse.cdt.debug.ui/plugin.xml
index a036691bc5a..04148dd0db3 100644
--- a/debug/org.eclipse.cdt.debug.ui/plugin.xml
+++ b/debug/org.eclipse.cdt.debug.ui/plugin.xml
@@ -70,8 +70,8 @@
          <view
                relative="org.eclipse.debug.ui.VariableView"
                visible="false"
-               id="org.eclipse.cdt.debug.ui.MemoryView"
-               relationship="stack">
+               relationship="stack"
+               id="org.eclipse.cdt.debug.ui.MemoryView">
          </view>
          <viewShortcut
                id="org.eclipse.cdt.debug.ui.MemoryView">
@@ -79,8 +79,8 @@
          <view
                relative="org.eclipse.debug.ui.VariableView"
                visible="false"
-               id="org.eclipse.cdt.debug.ui.SharedLibrariesView"
-               relationship="stack">
+               relationship="stack"
+               id="org.eclipse.cdt.debug.ui.SharedLibrariesView">
          </view>
          <viewShortcut
                id="org.eclipse.cdt.debug.ui.SharedLibrariesView">
@@ -88,8 +88,8 @@
          <view
                relative="org.eclipse.debug.ui.VariableView"
                visible="false"
-               id="org.eclipse.cdt.debug.ui.SignalsView"
-               relationship="stack">
+               relationship="stack"
+               id="org.eclipse.cdt.debug.ui.SignalsView">
          </view>
          <viewShortcut
                id="org.eclipse.cdt.debug.ui.SignalsView">
@@ -295,8 +295,8 @@
          </action>
          <action
                label="%SwitchToDisassemblyAction.label"
-               icon="icons/full/clcl16/disassembly.gif"
                style="toggle"
+               icon="icons/full/clcl16/disassembly.gif"
                helpContextId="switch_to_disassembly_action_context"
                class="org.eclipse.cdt.debug.internal.ui.actions.SwitchToDisassemblyActionDelegate"
                menubarPath="renderGroup"
@@ -311,8 +311,8 @@
          </action>
          <action
                label="%ShowDebuggerConsoleAction.label"
-               icon="icons/full/clcl16/debugger_console.gif"
                style="toggle"
+               icon="icons/full/clcl16/debugger_console.gif"
                helpContextId="show_debugger_console_action_context"
                class="org.eclipse.cdt.debug.internal.ui.actions.DebuggerConsoleActionDelegate"
                menubarPath="renderGroup"
@@ -717,8 +717,8 @@
                label="%LoadSymbolsAction.label"
                icon="icons/full/clcl16/load_symbols_co.gif"
                helpContextId="load_symbols_action_context"
-               tooltip="%LoadSymbolsAction.tooltip"
                class="org.eclipse.cdt.debug.internal.ui.actions.LoadSymbolsActionDelegate"
+               tooltip="%LoadSymbolsAction.tooltip"
                menubarPath="sharedLibrariesGroup"
                enablesFor="1"
                id="org.eclipse.cdt.debug.internal.ui.actions.LoadSymbolsActionDelegate">
@@ -737,8 +737,8 @@
                label="%SignalAction.label"
                icon="icons/full/clcl16/signal_co.gif"
                helpContextId="signal_action_context"
-               tooltip="%SignalAction.tooltip"
                class="org.eclipse.cdt.debug.internal.ui.actions.SignalActionDelegate"
+               tooltip="%SignalAction.tooltip"
                menubarPath="additions"
                enablesFor="1"
                id="org.eclipse.cdt.debug.internal.ui.actions.SignalActionDelegate">
@@ -753,8 +753,8 @@
                label="%SignalPropertiesAction.label"
                style="pulldown"
                helpContextId="signal_properties_action_context"
-               tooltip="%SignalPropertiesAction.tooltip"
                class="org.eclipse.cdt.debug.internal.ui.actions.SignalPropertiesActionDelegate"
+               tooltip="%SignalPropertiesAction.tooltip"
                enablesFor="1"
                id="org.eclipse.cdt.debug.ui.SignalPropertiesAction">
             <enablement>
@@ -790,8 +790,8 @@
          <action
                label="%RestoreDefaultTypeAction.label"
                helpContextId="restore_default_type_action_context"
-               class="org.eclipse.cdt.debug.internal.ui.actions.RestoreDefaultTypeActionDelegate"
                tooltip="%RestoreDefaultTypeAction.tooltip"
+               class="org.eclipse.cdt.debug.internal.ui.actions.RestoreDefaultTypeActionDelegate"
                menubarPath="additions"
                enablesFor="1"
                id="org.eclipse.cdt.debug.internal.ui.actions.RestoreDefaultTypeActionDelegate">
@@ -806,8 +806,8 @@
                label="%CastToTypeAction.label"
                icon="icons/full/clcl16/casttotype_co.gif"
                helpContextId="cast_to_type_action_context"
-               class="org.eclipse.cdt.debug.internal.ui.actions.CastToTypeActionDelegate"
                tooltip="%CastToTypeAction.tooltip"
+               class="org.eclipse.cdt.debug.internal.ui.actions.CastToTypeActionDelegate"
                menubarPath="additions"
                enablesFor="1"
                id="org.eclipse.cdt.debug.internal.ui.actions.CastToTypeActionDelegate">
@@ -822,8 +822,8 @@
                label="%CastToArrayAction.label"
                icon="icons/full/clcl16/showasarray_co.gif"
                helpContextId="cast_to_array_action_context"
-               class="org.eclipse.cdt.debug.internal.ui.actions.CastToArrayActionDelegate"
                tooltip="%CastToArrayAction.tooltip"
+               class="org.eclipse.cdt.debug.internal.ui.actions.CastToArrayActionDelegate"
                menubarPath="additions"
                enablesFor="1"
                id="org.eclipse.cdt.debug.internal.ui.actions.CastToArrayActionDelegate">
@@ -842,8 +842,8 @@
                label="%ManageFunctionBreakpointAction.label"
                icon="icons/full/obj16/funbrkp_obj.gif"
                helpContextId="manage_function_breakpoint_action_context"
-               class="org.eclipse.cdt.debug.internal.ui.actions.ManageFunctionBreakpointActionDelegate"
                tooltip="%ManageFunctionBreakpointAction.tooltip"
+               class="org.eclipse.cdt.debug.internal.ui.actions.ManageFunctionBreakpointActionDelegate"
                menubarPath="additions"
                enablesFor="1"
                id="org.eclipse.cdt.debug.internal.ui.actions.ManageFunctionBreakpointActionDelegate">
@@ -862,8 +862,8 @@
                label="%DisableVariablesAction.label"
                icon="icons/full/clcl16/disabled_co.gif"
                helpContextId="disable_variables_action_context"
-               class="org.eclipse.cdt.debug.internal.ui.actions.DisableVariablesActionDelegate"
                tooltip="%DisableVariablesAction.tooltip"
+               class="org.eclipse.cdt.debug.internal.ui.actions.DisableVariablesActionDelegate"
                menubarPath="variableGroup"
                enablesFor="2+"
                id="org.eclipse.cdt.debug.internal.ui.actions.DisableVariablesActionDelegate">
@@ -875,8 +875,8 @@
                label="%EnableVariablesAction.label"
                icon="icons/full/clcl16/enabled_co.gif"
                helpContextId="enable_variables_action_context"
-               class="org.eclipse.cdt.debug.internal.ui.actions.EnableVariablesActionDelegate"
                tooltip="%EnableVariablesAction.tooltip"
+               class="org.eclipse.cdt.debug.internal.ui.actions.EnableVariablesActionDelegate"
                menubarPath="variableGroup"
                enablesFor="2+"
                id="org.eclipse.cdt.debug.internal.ui.actions.EnableVariablesActionDelegate">
@@ -899,8 +899,8 @@
                disabledIcon="icons/full/dlcl16/restart.gif"
                enablesFor="1"
                icon="icons/full/elcl16/restart.gif"
-               label="%RestartAction.label"
                helpContextId="restart_action_context"
+               label="%RestartAction.label"
                tooltip="%RestartAction.tooltip">
             <enablement>
                <pluginState
@@ -918,8 +918,8 @@
                disabledIcon="icons/full/dlcl16/disassembly.gif"
                enablesFor="1"
                icon="icons/full/elcl16/disassembly.gif"
-               label="%SwitchToDisassemblyAction.label"
                helpContextId="switch_to_disassembly_action_context"
+               label="%SwitchToDisassemblyAction.label"
                tooltip="%SwitchToDisassemblyAction.tooltip">
             <enablement>
                <pluginState
@@ -937,8 +937,8 @@
                disabledIcon="icons/full/dlcl16/debugger_console.gif"
                enablesFor="1"
                icon="icons/full/elcl16/debugger_console.gif"
-               label="%ShowDebuggerConsoleAction.label"
                helpContextId="show_debugger_console_action_context"
+               label="%ShowDebuggerConsoleAction.label"
                tooltip="%ShowDebuggerConsoleAction.tooltip">
             <enablement>
                <pluginState
@@ -953,11 +953,11 @@
             id="org.eclipse.cdt.debug.ui.debugView.menu">
          <action
                label="%ShowFullPathsAction.label"
-               style="toggle"
                icon="icons/full/clcl16/show_paths.gif"
+               style="toggle"
                helpContextId="show_full_paths_context"
-               class="org.eclipse.cdt.debug.internal.ui.actions.ShowFullPathsAction"
                tooltip="%ShowFullPathsAction.tooltip"
+               class="org.eclipse.cdt.debug.internal.ui.actions.ShowFullPathsAction"
                menubarPath="cDebugActions"
                id="org.eclipse.cdt.debug.internal.ui.actions.ShowFullPathsAction">
             <enablement>
@@ -977,11 +977,11 @@
             id="org.eclipse.cdt.debug.ui.breakpointView.menu">
          <action
                label="%ShowFullPathsAction.label"
-               style="toggle"
                icon="icons/full/clcl16/show_paths.gif"
+               style="toggle"
                helpContextId="show_full_paths_context"
-               class="org.eclipse.cdt.debug.internal.ui.actions.ShowFullPathsAction"
                tooltip="%ShowFullPathsAction.tooltip"
+               class="org.eclipse.cdt.debug.internal.ui.actions.ShowFullPathsAction"
                menubarPath="cDebugActions"
                id="org.eclipse.cdt.debug.internal.ui.actions.ShowFullPathsAction">
             <enablement>
@@ -1003,8 +1003,8 @@
                disabledIcon="icons/full/dlcl16/watch_globals.gif"
                enablesFor="1"
                icon="icons/full/elcl16/watch_globals.gif"
-               label="%AddGlobalsAction.label"
                helpContextId="add_globals_action_context"
+               label="%AddGlobalsAction.label"
                tooltip="%AddGlobalsAction.tooltip">
             <enablement>
                <pluginState
@@ -1019,11 +1019,11 @@
             id="org.eclipse.debug.ui.sharedLibrariesView.menu">
          <action
                label="%ShowFullPathsAction.label"
-               icon="icons/full/clcl16/show_paths.gif"
                style="toggle"
+               icon="icons/full/clcl16/show_paths.gif"
                helpContextId="show_full_paths_context"
-               tooltip="%ShowFullPathsAction.tooltip"
                class="org.eclipse.cdt.debug.internal.ui.actions.ShowFullPathsAction"
+               tooltip="%ShowFullPathsAction.tooltip"
                menubarPath="cDebugActions"
                id="org.eclipse.cdt.debug.internal.ui.actions.ShowFullPathsAction">
             <enablement>
@@ -1114,20 +1114,20 @@
    <extension
          point="org.eclipse.debug.core.statusHandlers">
       <statusHandler
-            code="10000"
             plugin="org.eclipse.cdt.debug.core"
+            code="10000"
             class="org.eclipse.cdt.debug.internal.ui.QuestionStatusHandler"
             id="org.eclipse.cdt.debug.internal.ui.QuestionStatusHandler">
       </statusHandler>
       <statusHandler
-            code="10001"
             plugin="org.eclipse.cdt.debug.core"
+            code="10001"
             class="org.eclipse.cdt.debug.internal.ui.InfoStatusHandler"
             id="org.eclipse.cdt.debug.internal.ui.InfoStatusHandler">
       </statusHandler>
       <statusHandler
-            code="10002"
             plugin="org.eclipse.cdt.debug.core"
+            code="10002"
             class="org.eclipse.cdt.debug.internal.ui.ErrorStatusHandler"
             id="org.eclipse.cdt.debug.internal.ui.ErrorStatusHandler">
       </statusHandler>
@@ -1190,16 +1190,16 @@
          point="org.eclipse.ui.editors">
       <editor
             name="%DisassemblyEditor.name"
-            extensions="dasm"
             icon="icons/full/obj16/disassembly_obj.gif"
+            extensions="dasm"
             class="org.eclipse.cdt.debug.internal.ui.editors.DisassemblyEditor"
             id="org.eclipse.cdt.debug.ui.DisassemblyEditor">
       </editor>
       <editor
             name="%CDebugEditor.name"
             icon="icons/full/obj16/filenotfound_obj.gif"
-            class="org.eclipse.cdt.debug.internal.ui.editors.CDebugEditor"
             contributorClass="org.eclipse.cdt.internal.ui.editor.CEditorActionContributor"
+            class="org.eclipse.cdt.debug.internal.ui.editors.CDebugEditor"
             id="org.eclipse.cdt.debug.ui.editor.CDebugEditor">
       </editor>
    </extension>
@@ -1221,8 +1221,8 @@
       <context
             name="Debugging C/C++"
             description="Debugging C/C++ Programs"
-            id="org.eclipse.cdt.debug.ui.debugging"
-            parentId="org.eclipse.debug.ui.debugging">
+            parentId="org.eclipse.debug.ui.debugging"
+            id="org.eclipse.cdt.debug.ui.debugging">
       </context>
    </extension>
    <extension
@@ -1236,22 +1236,18 @@
          point="org.eclipse.debug.ui.contextViewBindings">
       <contextViewBinding
             viewId="org.eclipse.cdt.debug.ui.MemoryView"
-            autoClose="false"
             contextId="org.eclipse.cdt.debug.ui.debugging">
       </contextViewBinding>
       <contextViewBinding
             viewId="org.eclipse.cdt.debug.ui.SharedLibrariesView"
-            autoClose="false"
             contextId="org.eclipse.cdt.debug.ui.debugging">
       </contextViewBinding>
       <contextViewBinding
             viewId="org.eclipse.cdt.debug.ui.SignalsView"
-            autoClose="false"
             contextId="org.eclipse.cdt.debug.ui.debugging">
       </contextViewBinding>
       <contextViewBinding
             viewId="org.eclipse.debug.ui.RegistersView"
-            autoClose="false"
             contextId="org.eclipse.cdt.debug.ui.debugging">
       </contextViewBinding>
    </extension>