From e040e5626db65405ed046860a751466dbfc14e16 Mon Sep 17 00:00:00 2001
From: Martin <laz.git@mfriebe.de>
Date: Tue, 13 Jun 2023 20:34:35 +0200
Subject: [PATCH] IDE: Fix EditorOptions (Export Html), the index depended on
 the OS IFDEF

---
 ide/frames/editor_general_misc_options.pas | 25 +++++++++++-----------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/ide/frames/editor_general_misc_options.pas b/ide/frames/editor_general_misc_options.pas
index 2165caf04d..a9228bac65 100644
--- a/ide/frames/editor_general_misc_options.pas
+++ b/ide/frames/editor_general_misc_options.pas
@@ -114,17 +114,18 @@ begin
   begin
     // visual effects
     //Items.Add(dlgShowGutterHints);  // unimplemented
-    Items.Add(lisShowSpecialCharacters);
+    Items.Add(lisShowSpecialCharacters);      // 0
     // spaces
-    Items.Add(dlgTrimTrailingSpaces);
+    Items.Add(dlgTrimTrailingSpaces);         // 1
     // copying
-    Items.Add(dlgFindTextatCursor);
-    Items.Add(dlgCopyWordAtCursorOnCopyNone);
-    Items.Add(dlgCopyPasteKeepFolds);
-    {$IFDEF WinIME}
-    Items.Add(dlgUseMinimumIme);
+    Items.Add(dlgFindTextatCursor);           // 2
+    Items.Add(dlgCopyWordAtCursorOnCopyNone); // 3
+    Items.Add(dlgCopyPasteKeepFolds);         // 4
+    Items.Add(dlgEditExportBackColor);        // 5
+
+    {$IFDEF WinIME} // Keep last, or all subsequnt indexes will depend on it
+    Items.Add(dlgUseMinimumIme);              // 6
     {$ENDIF}
-    Items.Add(dlgEditExportBackColor);
   end;
   EditorTrimSpaceTypeComboBox.Items.Add(dlgTrimSpaceTypeLeaveLine);
   EditorTrimSpaceTypeComboBox.Items.Add(dlgTrimSpaceTypeEditLine);
@@ -158,10 +159,10 @@ begin
       Checked[2] := FindTextAtCursor;
       Checked[3] := CopyWordAtCursorOnCopyNone;
       Checked[4] := eoFoldedCopyPaste in SynEditOptions2;
+      Checked[5] := ExportHtmlWithBackground;
       {$IFDEF WinIME}
-      Checked[5] := UseMinimumIme;
+      Checked[6] := UseMinimumIme;
       {$ENDIF}
-      Checked[6] := ExportHtmlWithBackground;
 
       with ScrollOnEditLeftOptions do begin
         edLeftDist.Value   := KeepBorderDistance;
@@ -205,10 +206,10 @@ begin
     else
       SynEditOptions2 := SynEditOptions2 - [eoFoldedCopyPaste];
     TrimSpaceType := TSynEditStringTrimmingType(EditorTrimSpaceTypeComboBox.ItemIndex);
+    ExportHtmlWithBackground := EditorOptionsGroupBox.Checked[5];
     {$IFDEF WinIME}
-    UseMinimumIme := EditorOptionsGroupBox.Checked[5];
+    UseMinimumIme := EditorOptionsGroupBox.Checked[6];
     {$ENDIF}
-    ExportHtmlWithBackground := EditorOptionsGroupBox.Checked[6];
 
       with ScrollOnEditLeftOptions do begin
         KeepBorderDistance := edLeftDist.Value;