diff --git a/ide/fpconst.pas b/ide/fpconst.pas
index 7333e5ee69..604b34ef81 100644
--- a/ide/fpconst.pas
+++ b/ide/fpconst.pas
@@ -255,6 +255,7 @@ const
      hcDisassemblyWindow = 8011;
 
      hcShift             = 10000;
+     hcNoAltXShift       = 20000;
 
      hcUsingHelp         = 2;
      hcContents          = 3;
@@ -273,6 +274,7 @@ const
      hcRecentFileBase    = hcShift+cmRecentFileBase;
 
      hcCompiler          = hcShift+cmCompiler;
+     hcCompilerNoAltX    = hcNoAltXShift+cmCompiler;
      hcMemorySizes       = hcShift+cmMemorySizes;
      hcLinker            = hcShift+cmLinker;
      hcDebugger          = hcShift+cmDebugger;
@@ -312,6 +314,8 @@ const
      hcHelpMenu          = 9011;
 
      hcFirstCommand      = hcSystemMenu;
+     hcLastNormalCommand = hcNoAltXShift - 1;
+     hcFirstNoAltXCommand = hcNoAltXShift;
      hcLastCommand       = 65535;
 
      hcShowClipboard     = hcShift+cmShowClipboard;
@@ -434,7 +438,10 @@ implementation
 END.
 {
   $Log$
-  Revision 1.4  2002-01-22 16:33:51  pierre
+  Revision 1.5  2002-01-24 09:21:41  pierre
+   * only disable Alt-X in Options|Compiler dialog
+
+  Revision 1.4  2002/01/22 16:33:51  pierre
    Change IDE version to 0.9.2
 
   Revision 1.3  2001/11/07 00:28:52  pierre
diff --git a/ide/fphelp.pas b/ide/fphelp.pas
index 15e0718f2c..15d62d2668 100644
--- a/ide/fphelp.pas
+++ b/ide/fphelp.pas
@@ -190,7 +190,8 @@ begin
 
     hcOptionsMenu   : S:=hint_optionsmenu;
     hcSwitchesMode  : S:=hint_switchesmode;
-    hcCompiler      : S:=hint_compiler;
+    hcCompiler,
+    hcCompilerNoAltX  : S:=hint_compiler;
     hcMemorySizes   : S:=hint_memorysizes;
     hcLinker        : S:=hint_linkeroptions;
     hcDebugger      : S:=hint_debugoptions;
@@ -505,7 +506,10 @@ end;
 END.
 {
   $Log$
-  Revision 1.4  2001-10-01 00:24:09  pierre
+  Revision 1.5  2002-01-24 09:21:41  pierre
+   * only disable Alt-X in Options|Compiler dialog
+
+  Revision 1.4  2001/10/01 00:24:09  pierre
    * fix several help problems
 
   Revision 1.3  2001/09/10 10:52:59  pierre
diff --git a/ide/fpide.pas b/ide/fpide.pas
index 9e74c74c39..5c546b7ea3 100644
--- a/ide/fpide.pas
+++ b/ide/fpide.pas
@@ -475,13 +475,13 @@ begin
     NewStatusDef(hcStackWindow, hcStackWindow,
       NewStatusKey(status_help, kbF1, cmHelp,
       NewStatusKey(status_disassemble, kbAltI, cmDisassemble,
-      NewStatusKey('', kbAltF3, cmClose,
-      NewStatusKey('', kbF5, cmZoom,
-      NewStatusKey('', kbCtrlF5, cmResize,
-      NewStatusKey('', kbF6, cmNext,
-      NewStatusKey('', kbShiftF6, cmPrev,
-      nil))))))),
-    NewStatusDef(hcFirstCommand, hcLastCommand,
+      StdStatusKeys(
+      nil))),
+    NewStatusDef(hcFirstCommand, hcLastNormalCommand,
+      NewStatusKey(status_help, kbF1, cmHelp,
+      StdStatusKeys(
+      nil)),
+    NewStatusDef(hcFirstNoAltXCommand, hcLastCommand,
       NewStatusKey(status_help, kbF1, cmHelp,
       NewStatusKey('', kbF10, cmMenu,
       NewStatusKey('', kbAltF3, cmClose,
@@ -504,7 +504,8 @@ begin
       NewStatusKey(status_compile, kbAltF9, cmCompile,
       NewStatusKey(status_make, kbF9, cmMake,
       NewStatusKey(status_localmenu, kbAltF10, cmLocalMenu,
-      StdStatusKeys(
+      StdStatusKeys
+      (
       nil))))))),
     NewStatusDef(hcASCIITableWindow, hcASCIITableWindow,
       NewStatusKey(status_help, kbF1, cmHelp,
@@ -533,7 +534,7 @@ begin
       NewStatusKey(status_localmenu, kbAltF10, cmLocalMenu,
       StdStatusKeys(
       nil)))))),
-    nil)))))))))));
+    nil))))))))))));
 end;
 
 procedure TIDEApp.Idle;
@@ -1176,7 +1177,10 @@ end;
 END.
 {
   $Log$
-  Revision 1.7  2001-11-07 00:28:53  pierre
+  Revision 1.8  2002-01-24 09:21:42  pierre
+   * only disable Alt-X in Options|Compiler dialog
+
+  Revision 1.7  2001/11/07 00:28:53  pierre
    + Disassembly window made public
 
   Revision 1.6  2001/10/24 14:17:27  pierre
diff --git a/ide/fpmopts.inc b/ide/fpmopts.inc
index 68dcf40dcf..cf0f80ee20 100644
--- a/ide/fpmopts.inc
+++ b/ide/fpmopts.inc
@@ -79,7 +79,7 @@ begin
   New(D, Init(R, dialog_compilerswitches));
   with D^ do
   begin
-    HelpCtx:=hcCompiler;
+    HelpCtx:=hcCompilerNoAltX;
     GetExtent(R);
     R.Grow(-2,-1);
     Dec(R.B.Y,2);
@@ -1285,7 +1285,10 @@ end;
 
 {
   $Log$
-  Revision 1.5  2001-11-09 11:14:40  pierre
+  Revision 1.6  2002-01-24 09:21:42  pierre
+   * only disable Alt-X in Options|Compiler dialog
+
+  Revision 1.5  2001/11/09 11:14:40  pierre
    * fix the bug about smaller optimization not recorded
 
   Revision 1.4  2001/10/12 14:21:47  pierre