synedit: set default synedit font for carbon

IDE: sourceditor: using the same default font as synedit IDE: added code template d for debugln IDE: moved Insert $IFDEF in keymapping to edit section CodeTools: identifier completion: do not add semicolon in front of then, of, to, else, do CodeTools: define LCL and LCLwidgetset for lazarus sources IDE: Editor Options Keymapping: implemented text filter and shortcut search git-svn-id: trunk@15819 -
2025-04-16 12:09:32 +02:00 · 2008-07-19 09:51:32 +00:00 · 2008-07-19 09:51:32 +00:00 · 1341499890
commit 1341499890
parent d92dd510d2
12 changed files with 845 additions and 597 deletions
--- a/components/codetools/codetoolsstrconsts.pas
+++ b/components/codetools/codetoolsstrconsts.pas
@ -179,6 +179,8 @@ ResourceString
  ctsSrcPathInitialization = 'SrcPath Initialization';
  ctsUnitPathInitialization = 'UnitPath Initialization';
  ctsNestedCommentsOn = 'Nested Comments On';
+  ctsDefineLCL = 'Define LCL';
+  ctsDefineLCLWidgetset = 'Define LCLwidgetset, e.g. LCLgtk';
  ctsFPDocSystemOn = 'enable FPDocSystem';
  ctsCompiler = 'Compiler';
  ctsDefineProcessorType = 'Define processor type';
--- a/components/codetools/definetemplates.pas
+++ b/components/codetools/definetemplates.pas
@ -548,16 +548,14 @@ begin
      repeat
        p:=length(NameValue);
        while (p>=1) and (NameValue[p] in [' ',#9]) do dec(p);
-        //List.Add('AAA1 NameValue="'+NameValue+'" p='+IntToStr(p)+' "'+NameValue[p]+'"');
+        //List.Add(' NameValue="'+NameValue+'" p='+IntToStr(p)+' "'+NameValue[p]+'"');
        if (p>=1) and (NameValue[p]='\')
        and ((p=1) or (NameValue[p-1]<>'\')) then begin
          // append next line
          NameValue:=copy(NameValue,1,p-1);
-          //List.Add('AAA2 NameValue="'+NameValue+'"');
          inc(i);
          if i>=MakefileFPC.Count then break;
          NameValue:=NameValue+MakefileFPC[i];
-          //List.Add('AAA3 NameValue="'+NameValue+'"');
        end else break;
      until false;
      List.Add(NameValue);
@ -3949,6 +3947,8 @@ var
  CodeToolsDirTempl: TDefineTemplate;
  CodeToolsUnitsDirTempl: TDefineTemplate;
  FPGUIPlatformTempl: TDefineTemplate;
+  AllWidgetSets: String;
+  p: Integer;
 begin
  Result:=nil;
  if (LazarusSrcDir='') or (WidgetType='') then exit;
@ -3957,6 +3957,19 @@ begin
  SrcOS:='$('+ExternalMacroStart+'SrcOS)';
  SrcPath:='$('+ExternalMacroStart+'SrcPath)';
  IncPath:='$('+ExternalMacroStart+'IncPath)';
+  
+  AllWidgetSets:='';
+  for i:=Low(Lazarus_CPU_OS_Widget_Combinations)
+      to High(Lazarus_CPU_OS_Widget_Combinations) do
+  begin
+    SplitLazarusCPUOSWidgetCombo(Lazarus_CPU_OS_Widget_Combinations[i],
+                                 CurCPU,CurOS,CurWidgetSet);
+    if not HasDelimitedItem(AllWidgetSets,';',CurWidgetSet) then begin
+      if AllWidgetSets<>'' then
+        AllWidgetSets:=AllWidgetSets+';';
+      AllWidgetSets:=AllWidgetSets+CurWidgetSet;
+    end;
+  end;

  // <LazarusSrcDir>
  MainDir:=TDefineTemplate.Create(
@ -3974,40 +3987,24 @@ begin
      ExternalMacroStart+'SrcPath',
      d(LazarusSrcDir+'/lcl/nonwin32;')+SrcPath,da_DefineRecurse));
  MainDir.AddChild(IfTemplate);
-  MainDir.AddChild(TDefineTemplate.Create(
-    'LCL path addition',
-    Format(ctsAddsDirToSourcePath,['lcl']),ExternalMacroStart+'SrcPath',
-    d('lcl;lcl/interfaces/')+WidgetType+';'+SrcPath
-    ,da_Define));
-  // set SrcPath for IDE
-  MainDir.AddChild(TDefineTemplate.Create(
-    'Component path addition',
-    Format(ctsAddsDirToSourcePath,['designer, debugger, components, ..']),
-    ExternalMacroStart+'SrcPath',
-      d('designer;'
-       +'designer/jitform;'
-       +'debugger;'
-       +'converter;'
-       +'packager;'
-       +'packager/registration;'
-       +'ideintf;'
-       +'ide;'
-       +'components/synedit;'
-       +'components/codetools;'
-       +'components/custom;'
-       +'components/mpaslex;')
-       +SrcPath
-    ,da_Define));
-  // include path addition
-  MainDir.AddChild(TDefineTemplate.Create('includepath addition',
-    Format(ctsSetsIncPathTo,['ide/include, ide/include/TargetOS, ide/include/SrcOS']),
-    ExternalMacroStart+'IncPath',
-    d('ide/include;ide/include/'+TargetOS+';ide/include/'+SrcOS),
-    da_Define));
  // turn Nested comments on
  MainDir.AddChild(TDefineTemplate.Create('Nested Comments',
    ctsNestedCommentsOn,ExternalMacroStart+'NestedComments','',da_DefineRecurse));
-
+  // define 'LCL'
+  MainDir.AddChild(TDefineTemplate.Create('define LCL',
+    ctsDefineLCL,'LCL',WidgetType,da_DefineRecurse));
+  // define LCLwidgetset, e.g. LCLcarbon, LCLgtk, LCLgtk2
+  p:=1;
+  repeat
+    CurWidgetSet:=GetNextDelimitedItem(AllWidgetSets,';',p);
+    if CurWidgetSet='' then break;
+    IfTemplate:=TDefineTemplate.Create('IF '''+WidgetType+'''='''+CurWidgetSet+'''',
+      ctsDefineLCLWidgetset,'',''''+WidgetType+'''='''+CurWidgetSet+'''',da_If);
+      // then define LCLgtk, LCLgtk2, LCLcarbon, ...
+      IfTemplate.AddChild(TDefineTemplate.Create('Define LCL'+CurWidgetSet,
+        ctsDefineLCLWidgetset,'LCL'+CurWidgetSet,'',da_DefineRecurse));
+    MainDir.AddChild(IfTemplate);
+  until false;

  // <LazarusSrcDir>/include
  // (does not need special setup)
@ -4448,8 +4445,7 @@ begin
    +';'+LazarusSrcDir+'/lcl/interfaces/'+WidgetType)
    +';'+SrcPath
    ,da_DefineRecurse));
-  MainDir.AddChild(DirTempl);
-  
+
  // <LazarusSrcDir>/components/synedit/units
  SynEditDirTempl:=TDefineTemplate.Create('synedit',
    'SynEdit','','synedit',da_Directory);
--- a/components/codetools/fileprocs.pas
+++ b/components/codetools/fileprocs.pas
@ -229,6 +229,10 @@ procedure MergeSort(List: PPointer; ListLength: PtrInt;
                    Compare: TListSortCompare);
 function GetNextDelimitedItem(const List: string; Delimiter: char;
                              var Position: integer): string;
+function HasDelimitedItem(const List: string; Delimiter: char; FindItem: string
+                          ): boolean;
+function FindNextDelimitedItem(const List: string; Delimiter: char;
+                               var Position: integer; FindItem: string): string;
 function AVLTreeHasDoubles(Tree: TAVLTree): TAVLTreeNode;

 // debugging
@ -1877,6 +1881,25 @@ begin
  if Position<=length(List) then inc(Position); // skip Delimiter
 end;

+function HasDelimitedItem(const List: string; Delimiter: char; FindItem: string
+  ): boolean;
+var
+  p: Integer;
+begin
+  p:=1;
+  Result:=FindNextDelimitedItem(List,Delimiter,p,FindItem)<>'';
+end;
+
+function FindNextDelimitedItem(const List: string; Delimiter: char;
+  var Position: integer; FindItem: string): string;
+begin
+  while Position<=length(List) do begin
+    Result:=GetNextDelimitedItem(List,Delimiter,Position);
+    if Result=FindItem then exit;
+  end;
+  Result:='';
+end;
+
 function AVLTreeHasDoubles(Tree: TAVLTree): TAVLTreeNode;
 var
  Next: TAVLTreeNode;
--- a/components/codetools/identcompletiontool.pas
+++ b/components/codetools/identcompletiontool.pas
@ -149,8 +149,8 @@ type
  
  TIdentifierListContextFlag = (
    ilcfStartInStatement,  // context starts in statements. e.g. between begin..end
-    ilcfStartIsLValue,     // position is start of one statement. e.g. 'A:=', does not check if A can be assigned
-    ilcfNeedsEndSemicolon, // after context a semicolon is needed. e.g. 'A end'
+    ilcfStartIsLValue,     // position is start of one statement. e.g. 'A|:=', does not check if A can be assigned
+    ilcfNeedsEndSemicolon, // after context a semicolon is needed. e.g. 'A| end'
    ilcfIsExpression,      // is expression part of statement. e.g. 'if expr'
    ilcfCanProcDeclaration // context allows to declare a procedure/method
    );
@ -1514,16 +1514,18 @@ begin
        MoveCursorToCleanPos(StartPosOfVariable);
        ReadPriorAtom;
        CurrentIdentifierList.StartAtomInFront:=CurPos;
-        // check if LValue
        if (ilcfStartInStatement in CurrentIdentifierList.ContextFlags) then
        begin
+          // check if LValue
          if (CurPos.Flag in [cafSemicolon,cafBegin,cafEnd])
          or UpAtomIs('TRY') or UpAtomIs('FOR') or UpAtomIs('DO')
          then begin
            CurrentIdentifierList.ContextFlags:=
              CurrentIdentifierList.ContextFlags+[ilcfStartIsLValue];
          end;
+          // check if expression
          if UpAtomIs('IF') or UpAtomIs('CASE') or UpAtomIs('WHILE') then begin
+            // todo: check at start of expression, not only in front of variable
            CurrentIdentifierList.ContextFlags:=
              CurrentIdentifierList.ContextFlags+[ilcfIsExpression];
          end;
@ -1537,13 +1539,19 @@ begin
        // check if in statement
        if (ilcfStartInStatement in CurrentIdentifierList.ContextFlags) then
        begin
-          if (CurrentIdentifierList.StartBracketLvl=0) then begin
+          if (CurrentIdentifierList.StartBracketLvl=0)
+          and (not (ilcfStartIsLValue in CurrentIdentifierList.ContextFlags))
+          then begin
            // check if end needs semicolon
            if (CurPos.Flag in [cafEnd,cafBegin])
            or WordIsBlockKeyWord.DoItUpperCase(UpperSrc,
                                  CurPos.StartPos,CurPos.EndPos-CurPos.StartPos)
            or ((CurPos.Flag=cafWord)
                and (not UpAtomIs('ELSE'))
+                and (not UpAtomIs('THEN'))
+                and (not UpAtomIs('DO'))
+                and (not UpAtomIs('TO'))
+                and (not UpAtomIs('OF'))
                and (not PositionsInSameLine(Src,IdentEndPos,CurPos.StartPos)))
            then begin
              // add semicolon
--- a/components/synedit/synedit.pp
+++ b/components/synedit/synedit.pp
@ -88,7 +88,24 @@ const
  ALPHA_LC = ['a'..'z'];

 {$IFDEF SYN_LAZARUS}
-ScrollBarWidth=0;
+  ScrollBarWidth=0;
+  {$UNDEF SynDefaultFont}
+  {$IFDEF LCLgtk}
+  SynDefaultFontName = '-adobe-courier-medium-r-normal-*-*-140-*-*-*-*-iso10646-1';
+  SynDefaultFontHeight = 14;
+  {$DEFINE SynDefaultFont}
+  {$ENDIF}
+  {$IFDEF LCLcarbon}
+  SynDefaultFontName = 'Courier'; // Note: carbon is case sensitive
+  SynDefaultFontHeight = 14;
+  {$DEFINE SynDefaultFont}
+  {$ENDIF}
+  {$IFNDEF SynDefaultFont}
+  SynDefaultFontName = 'courier';
+  SynDefaultFontHeight = 12;
+  {$ENDIF}
+  SynDefaultFontPitch = fpFixed;
+
 {$ENDIF}

 {$IFNDEF SYN_COMPILER_3_UP}
@ -1428,14 +1445,9 @@ begin
  fMarkupManager.InvalidateLinesMethod := @InvalidateLines;

  Color := clWhite;
-  {$IFDEF LCLgtk}
-  fFontDummy.Name := '-adobe-courier-medium-r-normal-*-*-140-*-*-*-*-iso10646-1';
-  fFontDummy.Height := 14;
-  {$ELSE}
-  fFontDummy.Name := 'courier';
-  fFontDummy.Size := 12;
-  {$ENDIF}
-  fFontDummy.Pitch := fpFixed;
+  fFontDummy.Name := SynDefaultFontName;
+  fFontDummy.Height := SynDefaultFontHeight;
+  fFontDummy.Pitch := SynDefaultFontPitch;
  fLastMouseCaret := Point(-1,-1);
  fLastCtrlMouseLinkY := -1;
  fLastControlIsPressed := false;
--- a/ide/editoroptions.lfm
+++ b/ide/editoroptions.lfm
@ -1,7 +1,7 @@
 object EditorOptionsForm: TEditorOptionsForm
-  Left = 437
+  Left = 390
  Height = 541
-  Top = 206
+  Top = 120
  Width = 554
  ActiveControl = MainNotebook
  Caption = 'EditorOptionsForm'
@ -18,12 +18,12 @@ object EditorOptionsForm: TEditorOptionsForm
    Align = alTop
    Anchors = [akTop, akLeft, akRight, akBottom]
    BorderSpacing.Bottom = 6
-    PageIndex = 1
+    PageIndex = 2
    TabOrder = 0
    object GeneralPage: TPage
      Caption = 'GeneralPage'
-      ClientWidth = 550
-      ClientHeight = 463
+      ClientWidth = 548
+      ClientHeight = 455
      object BlockIndentLabel: TLabel
        AnchorSideLeft.Control = BlockIndentComboBox
        AnchorSideLeft.Side = asrBottom
@ -31,7 +31,7 @@ object EditorOptionsForm: TEditorOptionsForm
        AnchorSideBottom.Side = asrCenter
        Left = 112
        Height = 20
-        Top = 372
+        Top = 374
        Width = 109
        Anchors = [akLeft, akBottom]
        BorderSpacing.Around = 6
@ -45,7 +45,7 @@ object EditorOptionsForm: TEditorOptionsForm
        AnchorSideBottom.Side = asrCenter
        Left = 112
        Height = 20
-        Top = 403
+        Top = 401
        Width = 100
        Anchors = [akLeft, akBottom]
        BorderSpacing.Around = 6
@ -59,7 +59,7 @@ object EditorOptionsForm: TEditorOptionsForm
        AnchorSideBottom.Side = asrCenter
        Left = 112
        Height = 20
-        Top = 434
+        Top = 428
        Width = 98
        Anchors = [akLeft, akBottom]
        BorderSpacing.Around = 6
@ -70,9 +70,9 @@ object EditorOptionsForm: TEditorOptionsForm
        AnchorSideRight.Side = asrBottom
        AnchorSideBottom.Control = BlockIndentLabel
        Left = 6
-        Height = 354
+        Height = 356
        Top = 6
-        Width = 538
+        Width = 536
        Align = alTop
        Anchors = [akTop, akLeft, akRight, akBottom]
        AutoFill = True
@ -95,8 +95,8 @@ object EditorOptionsForm: TEditorOptionsForm
      object BlockIndentComboBox: TComboBox
        AnchorSideBottom.Control = UndoLimitComboBox
        Left = 6
-        Height = 25
-        Top = 370
+        Height = 21
+        Top = 374
        Width = 100
        Anchors = [akLeft, akBottom]
        AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending]
@ -116,7 +116,7 @@ object EditorOptionsForm: TEditorOptionsForm
      object UndoLimitComboBox: TComboBox
        AnchorSideBottom.Control = TabWidthsComboBox
        Left = 6
-        Height = 25
+        Height = 21
        Top = 401
        Width = 100
        Anchors = [akLeft, akBottom]
@ -137,8 +137,8 @@ object EditorOptionsForm: TEditorOptionsForm
        AnchorSideBottom.Control = GeneralPage
        AnchorSideBottom.Side = asrBottom
        Left = 6
-        Height = 25
-        Top = 432
+        Height = 21
+        Top = 428
        Width = 100
        Anchors = [akLeft, akBottom]
        AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending]
@ -158,24 +158,24 @@ object EditorOptionsForm: TEditorOptionsForm
    end
    object DisplayPage: TPage
      Caption = 'DisplayPage'
-      ClientWidth = 550
-      ClientHeight = 463
+      ClientWidth = 548
+      ClientHeight = 455
      object MarginAndGutterGroupBox: TGroupBox
        Left = 6
        Height = 128
        Top = 6
-        Width = 538
+        Width = 536
        Align = alTop
        BorderSpacing.Around = 6
        Caption = 'MarginAndGutterGroupBox'
-        ClientHeight = 109
-        ClientWidth = 534
+        ClientHeight = 106
+        ClientWidth = 528
        TabOrder = 0
        object RightMarginLabel: TLabel
          Left = 358
-          Height = 20
+          Height = 18
          Top = 10
-          Width = 110
+          Width = 107
          Caption = 'RightMarginLabel'
          ParentColor = False
        end
@ -201,50 +201,50 @@ object EditorOptionsForm: TEditorOptionsForm
        end
        object RightMarginColorLabel: TLabel
          Left = 358
-          Height = 20
+          Height = 18
          Top = 34
-          Width = 143
+          Width = 140
          Caption = 'RightMarginColorLabel'
          ParentColor = False
        end
        object GutterColorLabel: TLabel
          Left = 355
-          Height = 20
+          Height = 18
          Top = 64
-          Width = 109
+          Width = 107
          Caption = 'GutterColorLabel'
          ParentColor = False
        end
        object VisibleRightMarginCheckBox: TCheckBox
          Left = 6
-          Height = 22
+          Height = 18
          Top = 8
-          Width = 203
+          Width = 201
          Caption = 'VisibleRightMarginCheckBox'
          OnChange = GeneralCheckBoxOnChange
          TabOrder = 0
        end
        object VisibleGutterCheckBox: TCheckBox
          Left = 6
-          Height = 22
+          Height = 18
          Top = 32
-          Width = 169
+          Width = 164
          Caption = 'VisibleGutterCheckBox'
          OnChange = GeneralCheckBoxOnChange
          TabOrder = 1
        end
        object ShowLineNumbersCheckBox: TCheckBox
          Left = 6
-          Height = 22
+          Height = 18
          Top = 56
-          Width = 206
+          Width = 199
          Caption = 'ShowLineNumbersCheckBox'
          OnChange = GeneralCheckBoxOnChange
          TabOrder = 2
        end
        object RightMarginComboBox: TComboBox
          Left = 246
-          Height = 29
+          Height = 21
          Top = 8
          Width = 100
          AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending]
@ -264,19 +264,19 @@ object EditorOptionsForm: TEditorOptionsForm
        Left = 6
        Height = 148
        Top = 140
-        Width = 538
+        Width = 536
        Align = alTop
        AutoSize = True
        BorderSpacing.Around = 6
        Caption = 'EditorFontGroupBox'
-        ClientHeight = 129
-        ClientWidth = 534
+        ClientHeight = 126
+        ClientWidth = 528
        TabOrder = 1
        object EditorFontLabel: TLabel
          Left = 6
          Height = 20
          Top = 6
-          Width = 522
+          Width = 516
          Align = alTop
          BorderSpacing.Left = 6
          BorderSpacing.Top = 6
@ -289,8 +289,8 @@ object EditorOptionsForm: TEditorOptionsForm
          AnchorSideTop.Side = asrCenter
          Left = 116
          Height = 20
-          Top = 45
-          Width = 395
+          Top = 33
+          Width = 389
          Anchors = [akTop, akLeft, akRight]
          BorderSpacing.Around = 6
          Caption = 'EditorFontHeightLabel'
@ -301,8 +301,8 @@ object EditorOptionsForm: TEditorOptionsForm
          AnchorSideTop.Side = asrCenter
          Left = 116
          Height = 20
-          Top = 74
-          Width = 395
+          Top = 54
+          Width = 389
          Anchors = [akTop, akLeft, akRight]
          BorderSpacing.Around = 6
          Caption = 'ExtraLineSpacingLabel'
@ -313,8 +313,8 @@ object EditorOptionsForm: TEditorOptionsForm
          AnchorSideTop.Side = asrCenter
          Left = 116
          Height = 20
-          Top = 103
-          Width = 395
+          Top = 75
+          Width = 389
          Anchors = [akTop, akLeft, akRight]
          BorderSpacing.Around = 6
          Caption = 'ExtraCharSpacingLabel'
@ -323,9 +323,9 @@ object EditorOptionsForm: TEditorOptionsForm
        object EditorFontComboBox: TComboBox
          AnchorSideRight.Control = EditorFontButton
          Left = 6
-          Height = 29
+          Height = 21
          Top = 6
-          Width = 477
+          Width = 471
          Anchors = [akTop, akLeft, akRight]
          AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending]
          BorderSpacing.Around = 6
@ -335,7 +335,7 @@ object EditorOptionsForm: TEditorOptionsForm
          Text = 'EditorFontComboBox'
        end
        object EditorFontButton: TButton
-          Left = 489
+          Left = 483
          Height = 25
          Top = 6
          Width = 25
@ -348,8 +348,8 @@ object EditorOptionsForm: TEditorOptionsForm
          AnchorSideTop.Control = EditorFontComboBox
          AnchorSideTop.Side = asrBottom
          Left = 6
-          Height = 29
-          Top = 41
+          Height = 21
+          Top = 33
          Width = 100
          AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending]
          Items.Strings = (
@ -373,8 +373,8 @@ object EditorOptionsForm: TEditorOptionsForm
          AnchorSideTop.Control = EditorFontHeightComboBox
          AnchorSideTop.Side = asrBottom
          Left = 6
-          Height = 29
-          Top = 70
+          Height = 21
+          Top = 54
          Width = 100
          AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending]
          Items.Strings = (
@ -392,8 +392,8 @@ object EditorOptionsForm: TEditorOptionsForm
          AnchorSideTop.Control = ExtraLineSpacingComboBox
          AnchorSideTop.Side = asrBottom
          Left = 6
-          Height = 29
-          Top = 99
+          Height = 21
+          Top = 75
          Width = 100
          AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending]
          Items.Strings = (
@ -410,9 +410,9 @@ object EditorOptionsForm: TEditorOptionsForm
      end
      object DisplayPreview: TSynEdit
        Left = 6
-        Height = 163
+        Height = 155
        Top = 294
-        Width = 538
+        Width = 536
        Align = alClient
        BorderSpacing.Around = 6
        Font.Height = -16
@ -420,7 +420,6 @@ object EditorOptionsForm: TEditorOptionsForm
        Font.Pitch = fpFixed
        ParentColor = False
        TabOrder = 2
-        BookMarkOptions.OnChange = nil
        Gutter.CodeFoldingWidth = 14
        Keystrokes = <        
          item
@ -747,23 +746,21 @@ object EditorOptionsForm: TEditorOptionsForm
          'DisplayPreview'
        )
        ReadOnly = True
-        SelectedColor.OnChange = nil
        OnSpecialLineColors = OnSpecialLineColors
      end
    end
    object KeymappingPage: TPage
      Caption = 'KeymappingPage'
-      ClientWidth = 550
-      ClientHeight = 463
+      ClientWidth = 548
+      ClientHeight = 455
      object KeyMappingHelpLabel: TLabel
-        AnchorSideTop.Control = KeyMappingChooseSchemeButton
-        AnchorSideTop.Side = asrBottom
+        AnchorSideTop.Control = KeymappingPage
        Left = 8
-        Height = 20
-        Top = 50
-        Width = 140
+        Height = 18
+        Top = 6
+        Width = 137
        BorderSpacing.Left = 6
-        BorderSpacing.Top = 15
+        BorderSpacing.Top = 6
        BorderSpacing.Right = 6
        Caption = 'KeyMappingHelpLabel'
        ParentColor = False
@ -771,14 +768,15 @@ object EditorOptionsForm: TEditorOptionsForm
      object KeyMappingChooseSchemeButton: TButton
        AnchorSideLeft.Control = KeymappingPage
        AnchorSideTop.Control = KeymappingPage
+        AnchorSideBottom.Control = KeymappingPage
+        AnchorSideBottom.Side = asrBottom
        Left = 6
-        Height = 29
-        Top = 6
-        Width = 232
+        Height = 20
+        Top = 429
+        Width = 242
+        Anchors = [akLeft, akBottom]
        AutoSize = True
-        BorderSpacing.Left = 6
-        BorderSpacing.Top = 6
-        BorderSpacing.Right = 6
+        BorderSpacing.Around = 6
        Caption = 'KeyMappingChooseSchemeButton'
        OnClick = KeyMappingChooseSchemeButtonClick
        TabOrder = 0
@ -787,31 +785,33 @@ object EditorOptionsForm: TEditorOptionsForm
        AnchorSideTop.Control = KeymappingPage
        AnchorSideRight.Control = KeymappingPage
        AnchorSideRight.Side = asrBottom
-        Left = 297
-        Height = 29
-        Top = 6
-        Width = 247
-        Anchors = [akTop, akRight]
+        AnchorSideBottom.Control = KeymappingPage
+        AnchorSideBottom.Side = asrBottom
+        Left = 281
+        Height = 20
+        Top = 429
+        Width = 261
+        Anchors = [akRight, akBottom]
        AutoSize = True
-        BorderSpacing.Left = 6
-        BorderSpacing.Top = 6
-        BorderSpacing.Right = 6
+        BorderSpacing.Around = 6
        Caption = 'KeyMappingConsistencyCheckButton'
        OnClick = KeyMappingConsistencyCheckButtonClick
        TabOrder = 1
      end
      object KeyMappingTreeView: TTreeView
-        AnchorSideTop.Control = KeyMappingHelpLabel
+        AnchorSideLeft.Control = KeymappingPage
+        AnchorSideTop.Control = KeyMappingFilterEdit
        AnchorSideTop.Side = asrBottom
-        AnchorSideBottom.Side = asrBottom
+        AnchorSideRight.Control = KeymappingPage
+        AnchorSideRight.Side = asrBottom
+        AnchorSideBottom.Control = KeyMappingFindKeyButton
        Left = 6
-        Height = 381
-        Top = 76
-        Width = 538
-        Align = alBottom
-        Anchors = [akTop, akLeft, akBottom]
+        Height = 345
+        Top = 52
+        Width = 536
+        Anchors = [akTop, akLeft, akRight, akBottom]
        BorderSpacing.Around = 6
-        DefaultItemHeight = 23
+        DefaultItemHeight = 21
        Images = ImageList
        ReadOnly = True
        RowSelect = True
@ -819,6 +819,38 @@ object EditorOptionsForm: TEditorOptionsForm
        OnMouseUp = KeyMappingTreeViewMouseUp
        Options = [tvoAutoItemHeight, tvoHideSelection, tvoKeepCollapsedNodes, tvoReadOnly, tvoRowSelect, tvoShowButtons, tvoShowLines, tvoShowRoot, tvoShowSeparators, tvoToolTips]
      end
+      object KeyMappingFilterEdit: TEdit
+        AnchorSideLeft.Control = KeymappingPage
+        AnchorSideTop.Control = KeyMappingHelpLabel
+        AnchorSideTop.Side = asrBottom
+        AnchorSideRight.Control = KeymappingPage
+        AnchorSideRight.Side = asrBottom
+        Left = 6
+        Height = 16
+        Top = 30
+        Width = 536
+        Anchors = [akTop, akLeft, akRight]
+        AutoSize = True
+        BorderSpacing.Around = 6
+        OnChange = KeyMappingFilterEditChange
+        TabOrder = 3
+        Text = 'KeyMappingFilterEdit'
+      end
+      object KeyMappingFindKeyButton: TButton
+        AnchorSideLeft.Control = KeymappingPage
+        AnchorSideRight.Side = asrBottom
+        AnchorSideBottom.Control = KeyMappingChooseSchemeButton
+        Left = 6
+        Height = 20
+        Top = 403
+        Width = 197
+        Anchors = [akLeft, akBottom]
+        AutoSize = True
+        BorderSpacing.Around = 6
+        Caption = 'KeyMappingFindKeyButton'
+        OnClick = KeyMappingFindKeyButtonClick
+        TabOrder = 4
+      end
    end
    object ColorPage: TPage
      Caption = 'ColorPage'
@ -858,7 +890,7 @@ object EditorOptionsForm: TEditorOptionsForm
      end
      object LanguageComboBox: TComboBox
        Left = 3
-        Height = 29
+        Height = 21
        Top = 10
        Width = 200
        AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending]
@ -871,7 +903,7 @@ object EditorOptionsForm: TEditorOptionsForm
      end
      object ColorSchemeComboBox: TComboBox
        Left = 3
-        Height = 29
+        Height = 21
        Top = 34
        Width = 200
        AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending]
@ -884,7 +916,7 @@ object EditorOptionsForm: TEditorOptionsForm
      end
      object FileExtensionsComboBox: TComboBox
        Left = 3
-        Height = 29
+        Height = 21
        Top = 58
        Width = 200
        AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending]
@ -913,7 +945,6 @@ object EditorOptionsForm: TEditorOptionsForm
        ParentColor = False
        TabOrder = 3
        OnMouseDown = ColorPreviewMouseUp
-        BookMarkOptions.OnChange = nil
        Gutter.CodeFoldingWidth = 14
        Keystrokes = <        
          item
@ -1240,7 +1271,6 @@ object EditorOptionsForm: TEditorOptionsForm
          'ColorPreview'
        )
        ReadOnly = True
-        SelectedColor.OnChange = nil
        OnSpecialLineColors = OnSpecialLineColors
      end
      object ColorElementListBox: TListBox
@ -1252,7 +1282,6 @@ object EditorOptionsForm: TEditorOptionsForm
        OnClick = ColorElementListBoxClick
        OnSelectionChange = ColorElementListBoxSelectionChange
        TabOrder = 4
-        TopIndex = -1
      end
      object SetAttributeToDefaultButton: TButton
        AnchorSideRight.Control = ColorPage
@ -1291,8 +1320,8 @@ object EditorOptionsForm: TEditorOptionsForm
        Anchors = [akTop, akLeft, akRight, akBottom]
        BorderSpacing.Around = 6
        Caption = 'Attributes'
-        ClientHeight = 180
-        ClientWidth = 328
+        ClientHeight = 177
+        ClientWidth = 324
        TabOrder = 7
        object ForeGroundLabel: TLabel
          Left = 8
@ -1344,7 +1373,7 @@ object EditorOptionsForm: TEditorOptionsForm
          Left = 94
          Height = 22
          Top = 22
-          Width = 201
+          Width = 197
          Anchors = [akTop, akLeft, akRight]
          BorderSpacing.Top = 2
          Caption = 'ForeGroundUseDefaultCheckBox'
@ -1357,7 +1386,7 @@ object EditorOptionsForm: TEditorOptionsForm
          Left = 94
          Height = 22
          Top = 68
-          Width = 201
+          Width = 197
          Anchors = [akTop, akLeft, akRight]
          BorderSpacing.Right = 2
          Caption = 'BackGroundUseDefaultCheckBox'
@ -1367,8 +1396,8 @@ object EditorOptionsForm: TEditorOptionsForm
        object TextBoldCheckBox: TCheckBox
          Left = 6
          Height = 22
-          Top = 96
-          Width = 316
+          Top = 93
+          Width = 312
          Align = alBottom
          BorderSpacing.Around = 6
          Caption = 'TextBoldCheckBox'
@ -1378,8 +1407,8 @@ object EditorOptionsForm: TEditorOptionsForm
        object TextItalicCheckBox: TCheckBox
          Left = 6
          Height = 22
-          Top = 124
-          Width = 316
+          Top = 121
+          Width = 312
          Align = alBottom
          BorderSpacing.Around = 6
          Caption = 'TextItalicCheckBox'
@ -1389,8 +1418,8 @@ object EditorOptionsForm: TEditorOptionsForm
        object TextUnderlineCheckBox: TCheckBox
          Left = 6
          Height = 22
-          Top = 152
-          Width = 316
+          Top = 149
+          Width = 312
          Align = alBottom
          BorderSpacing.Around = 6
          Caption = 'TextUnderlineCheckBox'
@ -1411,14 +1440,14 @@ object EditorOptionsForm: TEditorOptionsForm
        Align = alClient
        BorderSpacing.Around = 6
        Caption = 'AutomaticFeaturesGroupBox'
-        ClientHeight = 432
-        ClientWidth = 534
+        ClientHeight = 429
+        ClientWidth = 530
        TabOrder = 0
        object AutoDelayLabel: TLabel
          Left = 6
          Height = 20
          Top = 188
-          Width = 522
+          Width = 518
          Align = alTop
          BorderSpacing.Top = 24
          BorderSpacing.Around = 6
@ -1439,7 +1468,7 @@ object EditorOptionsForm: TEditorOptionsForm
        object AutoDelayMaxLabel: TLabel
          AnchorSideTop.Control = AutoDelayTrackBar
          AnchorSideTop.Side = asrBottom
-          Left = 389
+          Left = 385
          Height = 20
          Top = 160
          Width = 127
@ -1453,7 +1482,7 @@ object EditorOptionsForm: TEditorOptionsForm
          Left = 6
          Height = 22
          Top = 6
-          Width = 522
+          Width = 518
          Align = alTop
          BorderSpacing.Around = 6
          Caption = 'AutoIdentifierCompletionCheckBox'
@ -1463,7 +1492,7 @@ object EditorOptionsForm: TEditorOptionsForm
          Left = 6
          Height = 22
          Top = 62
-          Width = 522
+          Width = 518
          Align = alTop
          BorderSpacing.Around = 6
          Caption = 'AutoCodeParametersCheckBox'
@ -1474,7 +1503,7 @@ object EditorOptionsForm: TEditorOptionsForm
          Left = 6
          Height = 22
          Top = 90
-          Width = 522
+          Width = 518
          Align = alTop
          BorderSpacing.Around = 6
          Caption = 'AutoToolTipExprEvalCheckBox'
@ -1484,7 +1513,7 @@ object EditorOptionsForm: TEditorOptionsForm
          Left = 6
          Height = 22
          Top = 34
-          Width = 522
+          Width = 518
          Align = alTop
          BorderSpacing.Around = 6
          Caption = 'AutoToolTipSymbToolsCheckBox'
@ -1494,7 +1523,7 @@ object EditorOptionsForm: TEditorOptionsForm
          Left = 6
          Height = 40
          Top = 118
-          Width = 522
+          Width = 518
          Frequency = 250
          Max = 4000
          Min = 500
@ -1560,10 +1589,10 @@ object EditorOptionsForm: TEditorOptionsForm
    TabOrder = 1
    object OkButton: TButton
      AnchorSideBottom.Side = asrBottom
-      Left = 369
+      Left = 342
      Height = 29
      Top = 6
-      Width = 75
+      Width = 88
      Align = alRight
      AutoSize = True
      BorderSpacing.Around = 6
@ -1575,10 +1604,10 @@ object EditorOptionsForm: TEditorOptionsForm
    object CancelButton: TButton
      AnchorSideRight.Side = asrBottom
      AnchorSideBottom.Side = asrBottom
-      Left = 450
+      Left = 436
      Height = 29
      Top = 6
-      Width = 98
+      Width = 112
      Align = alRight
      AutoSize = True
      BorderSpacing.Around = 6
@ -1591,8 +1620,8 @@ object EditorOptionsForm: TEditorOptionsForm
  object ImageList: TImageList
    Height = 21
    Width = 21
-    left = 400
-    top = 40
+    left = 344
+    top = 192
    Bitmap = {
      4C69020000001500000015000000000000000000000000000000000000000000
      0000000000000000000000000000000000000000000000000000000000000000
--- a/ide/editoroptions.lrs
+++ b/ide/editoroptions.lrs
@ -1,69 +1,69 @@
 { This is an automatically generated lazarus resource file }

 LazarusResources.Add('TEditorOptionsForm','FORMDATA',[
-  'TPF0'#18'TEditorOptionsForm'#17'EditorOptionsForm'#4'Left'#3#181#1#6'Height'
-  +#3#29#2#3'Top'#3#206#0#5'Width'#3'*'#2#13'ActiveControl'#7#12'MainNotebook'#7
-  +'Caption'#6#17'EditorOptionsForm'#12'ClientHeight'#3#29#2#11'ClientWidth'#3
-  +'*'#2#21'Constraints.MinHeight'#3#244#1#20'Constraints.MinWidth'#3#144#1#8'P'
-  +'osition'#7#14'poScreenCenter'#10'LCLVersion'#6#6'0.9.25'#0#9'TNotebook'#12
-  +'MainNotebook'#24'AnchorSideBottom.Control'#7#8'BtnPanel'#6'Height'#3#238#1#5
-  +'Width'#3'*'#2#5'Align'#7#5'alTop'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRigh'
-  +'t'#8'akBottom'#0#20'BorderSpacing.Bottom'#2#6#9'PageIndex'#2#1#8'TabOrder'#2
-  +#0#0#5'TPage'#11'GeneralPage'#7'Caption'#6#11'GeneralPage'#11'ClientWidth'#3
-  +'&'#2#12'ClientHeight'#3#207#1#0#6'TLabel'#16'BlockIndentLabel'#22'AnchorSid'
-  +'eLeft.Control'#7#19'BlockIndentComboBox'#19'AnchorSideLeft.Side'#7#9'asrBot'
-  +'tom'#24'AnchorSideBottom.Control'#7#19'BlockIndentComboBox'#21'AnchorSideBo'
-  +'ttom.Side'#7#9'asrCenter'#4'Left'#2'p'#6'Height'#2#20#3'Top'#3't'#1#5'Width'
-  +#2'm'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#7'C'
-  +'aption'#6#16'BlockIndentLabel'#11'ParentColor'#8#0#0#6'TLabel'#14'UndoLimit'
-  +'Label'#22'AnchorSideLeft.Control'#7#17'UndoLimitComboBox'#19'AnchorSideLeft'
-  +'.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#17'UndoLimitComboBox'
-  +#21'AnchorSideBottom.Side'#7#9'asrCenter'#4'Left'#2'p'#6'Height'#2#20#3'Top'
-  +#3#147#1#5'Width'#2'd'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#20'BorderSpacin'
-  +'g.Around'#2#6#7'Caption'#6#14'UndoLimitLabel'#11'ParentColor'#8#0#0#6'TLabe'
-  +'l'#14'TabWidthsLabel'#22'AnchorSideLeft.Control'#7#17'TabWidthsComboBox'#19
-  +'AnchorSideLeft.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#17'TabWi'
-  +'dthsComboBox'#21'AnchorSideBottom.Side'#7#9'asrCenter'#4'Left'#2'p'#6'Heigh'
-  +'t'#2#20#3'Top'#3#178#1#5'Width'#2'b'#7'Anchors'#11#6'akLeft'#8'akBottom'#0
-  +#20'BorderSpacing.Around'#2#6#7'Caption'#6#14'TabWidthsLabel'#11'ParentColor'
-  +#8#0#0#11'TCheckGroup'#21'EditorOptionsGroupBox'#20'AnchorSideRight.Side'#7#9
-  +'asrBottom'#24'AnchorSideBottom.Control'#7#16'BlockIndentLabel'#4'Left'#2#6#6
-  +'Height'#3'b'#1#3'Top'#2#6#5'Width'#3#26#2#5'Align'#7#5'alTop'#7'Anchors'#11
-  +#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#8'AutoFill'#9#20'BorderSpacing.'
-  +'Bottom'#2#6#20'BorderSpacing.Around'#2#6#7'Caption'#6#21'EditorOptionsGroup'
-  +'Box'#28'ChildSizing.LeftRightSpacing'#2#6#28'ChildSizing.TopBottomSpacing'#2
-  +#6#29'ChildSizing.EnlargeHorizontal'#7#24'crsHomogenousChildResize'#27'Child'
-  +'Sizing.EnlargeVertical'#7#24'crsHomogenousChildResize'#28'ChildSizing.Shrin'
-  +'kHorizontal'#7#14'crsScaleChilds'#26'ChildSizing.ShrinkVertical'#7#14'crsSc'
-  +'aleChilds'#18'ChildSizing.Layout'#7#29'cclTopToBottomThenLeftToRight'#27'Ch'
-  +'ildSizing.ControlsPerLine'#2#1#12'ColumnLayout'#7#24'clVerticalThenHorizont'
-  +'al'#7'Columns'#2#2#11'OnItemClick'#7#23'GeneralCheckBoxOnChange'#8'TabOrder'
-  +#2#0#0#0#9'TComboBox'#19'BlockIndentComboBox'#24'AnchorSideBottom.Control'#7
-  +#17'UndoLimitComboBox'#4'Left'#2#6#6'Height'#2#25#3'Top'#3'r'#1#5'Width'#2'd'
-  +#7'Anchors'#11#6'akLeft'#8'akBottom'#0#16'AutoCompleteText'#11#22'cbactEndOf'
-  +'LineComplete'#20'cbactSearchAscending'#0#20'BorderSpacing.Around'#2#6#13'It'
-  +'ems.Strings'#1#6#1'1'#6#1'2'#6#1'4'#6#1'8'#0#9'MaxLength'#2#0#8'OnChange'#7
-  +#16'ComboBoxOnChange'#6'OnExit'#7#14'ComboBoxOnExit'#9'OnKeyDown'#7#17'Combo'
-  +'BoxOnKeyDown'#8'TabOrder'#2#1#0#0#9'TComboBox'#17'UndoLimitComboBox'#24'Anc'
-  +'horSideBottom.Control'#7#17'TabWidthsComboBox'#4'Left'#2#6#6'Height'#2#25#3
-  +'Top'#3#145#1#5'Width'#2'd'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#16'AutoCom'
-  +'pleteText'#11#22'cbactEndOfLineComplete'#20'cbactSearchAscending'#0#20'Bord'
-  +'erSpacing.Around'#2#6#13'Items.Strings'#1#6#5'32767'#6#4'4096'#6#3'512'#0#9
-  +'MaxLength'#2#0#8'OnChange'#7#16'ComboBoxOnChange'#6'OnExit'#7#14'ComboBoxOn'
-  +'Exit'#9'OnKeyDown'#7#17'ComboBoxOnKeyDown'#8'TabOrder'#2#2#0#0#9'TComboBox'
+  'TPF0'#18'TEditorOptionsForm'#17'EditorOptionsForm'#4'Left'#3#134#1#6'Height'
+  +#3#29#2#3'Top'#2'x'#5'Width'#3'*'#2#13'ActiveControl'#7#12'MainNotebook'#7'C'
+  +'aption'#6#17'EditorOptionsForm'#12'ClientHeight'#3#29#2#11'ClientWidth'#3'*'
+  +#2#21'Constraints.MinHeight'#3#244#1#20'Constraints.MinWidth'#3#144#1#8'Posi'
+  +'tion'#7#14'poScreenCenter'#10'LCLVersion'#6#6'0.9.25'#0#9'TNotebook'#12'Mai'
+  +'nNotebook'#24'AnchorSideBottom.Control'#7#8'BtnPanel'#6'Height'#3#238#1#5'W'
+  +'idth'#3'*'#2#5'Align'#7#5'alTop'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'
+  +#8'akBottom'#0#20'BorderSpacing.Bottom'#2#6#9'PageIndex'#2#2#8'TabOrder'#2#0
+  +#0#5'TPage'#11'GeneralPage'#7'Caption'#6#11'GeneralPage'#11'ClientWidth'#3'$'
+  +#2#12'ClientHeight'#3#199#1#0#6'TLabel'#16'BlockIndentLabel'#22'AnchorSideLe'
+  +'ft.Control'#7#19'BlockIndentComboBox'#19'AnchorSideLeft.Side'#7#9'asrBottom'
+  +#24'AnchorSideBottom.Control'#7#19'BlockIndentComboBox'#21'AnchorSideBottom.'
+  +'Side'#7#9'asrCenter'#4'Left'#2'p'#6'Height'#2#20#3'Top'#3'v'#1#5'Width'#2'm'
+  +#7'Anchors'#11#6'akLeft'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#7'Captio'
+  +'n'#6#16'BlockIndentLabel'#11'ParentColor'#8#0#0#6'TLabel'#14'UndoLimitLabel'
+  +#22'AnchorSideLeft.Control'#7#17'UndoLimitComboBox'#19'AnchorSideLeft.Side'#7
+  +#9'asrBottom'#24'AnchorSideBottom.Control'#7#17'UndoLimitComboBox'#21'Anchor'
+  +'SideBottom.Side'#7#9'asrCenter'#4'Left'#2'p'#6'Height'#2#20#3'Top'#3#145#1#5
+  +'Width'#2'd'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#20'BorderSpacing.Around'#2
+  +#6#7'Caption'#6#14'UndoLimitLabel'#11'ParentColor'#8#0#0#6'TLabel'#14'TabWid'
+  +'thsLabel'#22'AnchorSideLeft.Control'#7#17'TabWidthsComboBox'#19'AnchorSideL'
+  +'eft.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#17'TabWidthsComboBo'
+  +'x'#21'AnchorSideBottom.Side'#7#9'asrCenter'#4'Left'#2'p'#6'Height'#2#20#3'T'
+  +'op'#3#172#1#5'Width'#2'b'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#20'BorderSp'
+  +'acing.Around'#2#6#7'Caption'#6#14'TabWidthsLabel'#11'ParentColor'#8#0#0#11
+  +'TCheckGroup'#21'EditorOptionsGroupBox'#20'AnchorSideRight.Side'#7#9'asrBott'
+  +'om'#24'AnchorSideBottom.Control'#7#16'BlockIndentLabel'#4'Left'#2#6#6'Heigh'
+  +'t'#3'd'#1#3'Top'#2#6#5'Width'#3#24#2#5'Align'#7#5'alTop'#7'Anchors'#11#5'ak'
+  +'Top'#6'akLeft'#7'akRight'#8'akBottom'#0#8'AutoFill'#9#20'BorderSpacing.Bott'
+  +'om'#2#6#20'BorderSpacing.Around'#2#6#7'Caption'#6#21'EditorOptionsGroupBox'
+  +#28'ChildSizing.LeftRightSpacing'#2#6#28'ChildSizing.TopBottomSpacing'#2#6#29
+  +'ChildSizing.EnlargeHorizontal'#7#24'crsHomogenousChildResize'#27'ChildSizin'
+  +'g.EnlargeVertical'#7#24'crsHomogenousChildResize'#28'ChildSizing.ShrinkHori'
+  +'zontal'#7#14'crsScaleChilds'#26'ChildSizing.ShrinkVertical'#7#14'crsScaleCh'
+  +'ilds'#18'ChildSizing.Layout'#7#29'cclTopToBottomThenLeftToRight'#27'ChildSi'
+  +'zing.ControlsPerLine'#2#1#12'ColumnLayout'#7#24'clVerticalThenHorizontal'#7
+  +'Columns'#2#2#11'OnItemClick'#7#23'GeneralCheckBoxOnChange'#8'TabOrder'#2#0#0
+  +#0#9'TComboBox'#19'BlockIndentComboBox'#24'AnchorSideBottom.Control'#7#17'Un'
+  +'doLimitComboBox'#4'Left'#2#6#6'Height'#2#21#3'Top'#3'v'#1#5'Width'#2'd'#7'A'
+  +'nchors'#11#6'akLeft'#8'akBottom'#0#16'AutoCompleteText'#11#22'cbactEndOfLin'
+  +'eComplete'#20'cbactSearchAscending'#0#20'BorderSpacing.Around'#2#6#13'Items'
+  +'.Strings'#1#6#1'1'#6#1'2'#6#1'4'#6#1'8'#0#9'MaxLength'#2#0#8'OnChange'#7#16
+  +'ComboBoxOnChange'#6'OnExit'#7#14'ComboBoxOnExit'#9'OnKeyDown'#7#17'ComboBox'
+  +'OnKeyDown'#8'TabOrder'#2#1#0#0#9'TComboBox'#17'UndoLimitComboBox'#24'Anchor'
+  +'SideBottom.Control'#7#17'TabWidthsComboBox'#4'Left'#2#6#6'Height'#2#21#3'To'
+  +'p'#3#145#1#5'Width'#2'd'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#16'AutoCompl'
+  +'eteText'#11#22'cbactEndOfLineComplete'#20'cbactSearchAscending'#0#20'Border'
+  +'Spacing.Around'#2#6#13'Items.Strings'#1#6#5'32767'#6#4'4096'#6#3'512'#0#9'M'
+  +'axLength'#2#0#8'OnChange'#7#16'ComboBoxOnChange'#6'OnExit'#7#14'ComboBoxOnE'
+  +'xit'#9'OnKeyDown'#7#17'ComboBoxOnKeyDown'#8'TabOrder'#2#2#0#0#9'TComboBox'
  +#17'TabWidthsComboBox'#24'AnchorSideBottom.Control'#7#11'GeneralPage'#21'Anc'
-  +'horSideBottom.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#25#3'Top'#3#176#1
+  +'horSideBottom.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#21#3'Top'#3#172#1
  +#5'Width'#2'd'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#16'AutoCompleteText'#11
  +#22'cbactEndOfLineComplete'#20'cbactSearchAscending'#0#20'BorderSpacing.Arou'
  +'nd'#2#6#13'Items.Strings'#1#6#1'1'#6#1'2'#6#1'4'#6#1'8'#0#9'MaxLength'#2#0#8
  +'OnChange'#7#16'ComboBoxOnChange'#6'OnExit'#7#14'ComboBoxOnExit'#9'OnKeyDown'
  +#7#17'ComboBoxOnKeyDown'#8'TabOrder'#2#3#0#0#0#5'TPage'#11'DisplayPage'#7'Ca'
-  +'ption'#6#11'DisplayPage'#11'ClientWidth'#3'&'#2#12'ClientHeight'#3#207#1#0#9
+  +'ption'#6#11'DisplayPage'#11'ClientWidth'#3'$'#2#12'ClientHeight'#3#199#1#0#9
  +'TGroupBox'#23'MarginAndGutterGroupBox'#4'Left'#2#6#6'Height'#3#128#0#3'Top'
-  +#2#6#5'Width'#3#26#2#5'Align'#7#5'alTop'#20'BorderSpacing.Around'#2#6#7'Capt'
-  +'ion'#6#23'MarginAndGutterGroupBox'#12'ClientHeight'#2'm'#11'ClientWidth'#3
-  +#22#2#8'TabOrder'#2#0#0#6'TLabel'#16'RightMarginLabel'#4'Left'#3'f'#1#6'Heig'
-  +'ht'#2#20#3'Top'#2#10#5'Width'#2'n'#7'Caption'#6#16'RightMarginLabel'#11'Par'
+  +#2#6#5'Width'#3#24#2#5'Align'#7#5'alTop'#20'BorderSpacing.Around'#2#6#7'Capt'
+  +'ion'#6#23'MarginAndGutterGroupBox'#12'ClientHeight'#2'j'#11'ClientWidth'#3
+  +#16#2#8'TabOrder'#2#0#0#6'TLabel'#16'RightMarginLabel'#4'Left'#3'f'#1#6'Heig'
+  +'ht'#2#18#3'Top'#2#10#5'Width'#2'k'#7'Caption'#6#16'RightMarginLabel'#11'Par'
  +'entColor'#8#0#0#12'TColorButton'#22'RightMarginColorButton'#4'Left'#3#246#0
  ,#6'Height'#2#21#3'Top'#2'$'#5'Width'#2'd'#11'BorderWidth'#2#2#15'ButtonColor'
  +'Size'#2#16#5'Color'#7#9'clBtnFace'#14'OnColorChanged'#7'"RightMarginColorBu'
@ -71,177 +71,77 @@ LazarusResources.Add('TEditorOptionsForm','FORMDATA',[
  +#6'Height'#2#21#3'Top'#2'?'#5'Width'#2'd'#11'BorderWidth'#2#2#15'ButtonColor'
  +'Size'#2#16#5'Color'#7#9'clBtnFace'#14'OnColorChanged'#7#23'ColorButtonColor'
  +'Changed'#0#0#6'TLabel'#21'RightMarginColorLabel'#4'Left'#3'f'#1#6'Height'#2
-  +#20#3'Top'#2'"'#5'Width'#3#143#0#7'Caption'#6#21'RightMarginColorLabel'#11'P'
+  +#18#3'Top'#2'"'#5'Width'#3#140#0#7'Caption'#6#21'RightMarginColorLabel'#11'P'
  +'arentColor'#8#0#0#6'TLabel'#16'GutterColorLabel'#4'Left'#3'c'#1#6'Height'#2
-  +#20#3'Top'#2'@'#5'Width'#2'm'#7'Caption'#6#16'GutterColorLabel'#11'ParentCol'
+  +#18#3'Top'#2'@'#5'Width'#2'k'#7'Caption'#6#16'GutterColorLabel'#11'ParentCol'
  +'or'#8#0#0#9'TCheckBox'#26'VisibleRightMarginCheckBox'#4'Left'#2#6#6'Height'
-  +#2#22#3'Top'#2#8#5'Width'#3#203#0#7'Caption'#6#26'VisibleRightMarginCheckBox'
+  +#2#18#3'Top'#2#8#5'Width'#3#201#0#7'Caption'#6#26'VisibleRightMarginCheckBox'
  +#8'OnChange'#7#23'GeneralCheckBoxOnChange'#8'TabOrder'#2#0#0#0#9'TCheckBox'
-  +#21'VisibleGutterCheckBox'#4'Left'#2#6#6'Height'#2#22#3'Top'#2' '#5'Width'#3
-  +#169#0#7'Caption'#6#21'VisibleGutterCheckBox'#8'OnChange'#7#23'GeneralCheckB'
+  +#21'VisibleGutterCheckBox'#4'Left'#2#6#6'Height'#2#18#3'Top'#2' '#5'Width'#3
+  +#164#0#7'Caption'#6#21'VisibleGutterCheckBox'#8'OnChange'#7#23'GeneralCheckB'
  +'oxOnChange'#8'TabOrder'#2#1#0#0#9'TCheckBox'#23'ShowLineNumbersCheckBox'#4
-  +'Left'#2#6#6'Height'#2#22#3'Top'#2'8'#5'Width'#3#206#0#7'Caption'#6#23'ShowL'
+  +'Left'#2#6#6'Height'#2#18#3'Top'#2'8'#5'Width'#3#199#0#7'Caption'#6#23'ShowL'
  +'ineNumbersCheckBox'#8'OnChange'#7#23'GeneralCheckBoxOnChange'#8'TabOrder'#2
-  +#2#0#0#9'TComboBox'#19'RightMarginComboBox'#4'Left'#3#246#0#6'Height'#2#29#3
+  +#2#0#0#9'TComboBox'#19'RightMarginComboBox'#4'Left'#3#246#0#6'Height'#2#21#3
  +'Top'#2#8#5'Width'#2'd'#16'AutoCompleteText'#11#22'cbactEndOfLineComplete'#20
  +'cbactSearchAscending'#0#13'Items.Strings'#1#6#2'80'#6#2'78'#6#2'76'#0#9'Max'
  +'Length'#2#0#8'OnChange'#7#16'ComboBoxOnChange'#6'OnExit'#7#14'ComboBoxOnExi'
  +'t'#9'OnKeyDown'#7#17'ComboBoxOnKeyDown'#8'TabOrder'#2#3#0#0#0#9'TGroupBox'
  +#18'EditorFontGroupBox'#4'Left'#2#6#6'Height'#3#148#0#3'Top'#3#140#0#5'Width'
-  +#3#26#2#5'Align'#7#5'alTop'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Cap'
-  +'tion'#6#18'EditorFontGroupBox'#12'ClientHeight'#3#129#0#11'ClientWidth'#3#22
-  +#2#8'TabOrder'#2#1#0#6'TLabel'#15'EditorFontLabel'#4'Left'#2#6#6'Height'#2#20
-  +#3'Top'#2#6#5'Width'#3#10#2#5'Align'#7#5'alTop'#18'BorderSpacing.Left'#2#6#17
-  +'BorderSpacing.Top'#2#6#19'BorderSpacing.Right'#2#6#7'Caption'#6#15'EditorFo'
-  +'ntLabel'#11'ParentColor'#8#0#0#6'TLabel'#21'EditorFontHeightLabel'#21'Ancho'
-  +'rSideTop.Control'#7#24'EditorFontHeightComboBox'#18'AnchorSideTop.Side'#7#9
-  +'asrCenter'#4'Left'#2't'#6'Height'#2#20#3'Top'#2'-'#5'Width'#3#139#1#7'Ancho'
+  +#3#24#2#5'Align'#7#5'alTop'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Cap'
+  +'tion'#6#18'EditorFontGroupBox'#12'ClientHeight'#2'~'#11'ClientWidth'#3#16#2
+  +#8'TabOrder'#2#1#0#6'TLabel'#15'EditorFontLabel'#4'Left'#2#6#6'Height'#2#20#3
+  +'Top'#2#6#5'Width'#3#4#2#5'Align'#7#5'alTop'#18'BorderSpacing.Left'#2#6#17'B'
+  +'orderSpacing.Top'#2#6#19'BorderSpacing.Right'#2#6#7'Caption'#6#15'EditorFon'
+  +'tLabel'#11'ParentColor'#8#0#0#6'TLabel'#21'EditorFontHeightLabel'#21'Anchor'
+  +'SideTop.Control'#7#24'EditorFontHeightComboBox'#18'AnchorSideTop.Side'#7#9
+  +'asrCenter'#4'Left'#2't'#6'Height'#2#20#3'Top'#2'!'#5'Width'#3#133#1#7'Ancho'
  +'rs'#11#5'akTop'#6'akLeft'#7'akRight'#0#20'BorderSpacing.Around'#2#6#7'Capti'
  +'on'#6#21'EditorFontHeightLabel'#11'ParentColor'#8#0#0#6'TLabel'#21'ExtraLin'
  +'eSpacingLabel'#21'AnchorSideTop.Control'#7#24'ExtraLineSpacingComboBox'#18
-  +'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2't'#6'Height'#2#20#3'Top'#2'J'#5
-  +'Width'#3#139#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#20'BorderSpaci'
+  +'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2't'#6'Height'#2#20#3'Top'#2'6'#5
+  +'Width'#3#133#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#20'BorderSpaci'
  +'ng.Around'#2#6#7'Caption'#6#21'ExtraLineSpacingLabel'#11'ParentColor'#8#0#0
  +#6'TLabel'#21'ExtraCharSpacingLabel'#21'AnchorSideTop.Control'#7#24'ExtraCha'
  +'rSpacingComboBox'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2't'#6'Heig'
-  +'ht'#2#20#3'Top'#2'g'#5'Width'#3#139#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'ak'
+  +'ht'#2#20#3'Top'#2'K'#5'Width'#3#133#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'ak'
  +'Right'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#21'ExtraCharSpacingLabel'
  +#11'ParentColor'#8#0#0#9'TComboBox'#18'EditorFontComboBox'#23'AnchorSideRigh'
-  +'t.Control'#7#16'EditorFontButton'#4'Left'#2#6#6'Height'#2#29#3'Top'#2#6#5'W'
-  +'idth'#3#221#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#16'AutoComplete'
+  +'t.Control'#7#16'EditorFontButton'#4'Left'#2#6#6'Height'#2#21#3'Top'#2#6#5'W'
+  +'idth'#3#215#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#16'AutoComplete'
  +'Text'#11#22'cbactEndOfLineComplete'#20'cbactSearchAscending'#0#20'BorderSpa'
  +'cing.Around'#2#6#9'MaxLength'#2#0#13'OnEditingDone'#7#29'EditorFontComboBox'
  +'EditingDone'#8'TabOrder'#2#0#4'Text'#6#18'EditorFontComboBox'#0#0#7'TButton'
-  +#16'EditorFontButton'#4'Left'#3#233#1#6'Height'#2#25#3'Top'#2#6#5'Width'#2#25
+  +#16'EditorFontButton'#4'Left'#3#227#1#6'Height'#2#25#3'Top'#2#6#5'Width'#2#25
  +#7'Anchors'#11#5'akTop'#7'akRight'#0#7'Caption'#6#3'...'#7'OnClick'#7#21'Edi'
  +'torFontButtonClick'#8'TabOrder'#2#1#0#0#9'TComboBox'#24'EditorFontHeightCom'
  +'boBox'#21'AnchorSideTop.Control'#7#18'EditorFontComboBox'#18'AnchorSideTop.'
-  +'Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#29#3'Top'#2')'#5'Width'#2'd'#16
+  +'Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#21#3'Top'#2'!'#5'Width'#2'd'#16
  +'AutoCompleteText'#11#22'cbactEndOfLineComplete'#20'cbactSearchAscending'#0
  +#13'Items.Strings'#1#6#2'10'#6#2'11'#6#2'12'#6#2'13'#6#2'14'#6#2'15'#6#2'16'
  +#6#2'17'#6#2'18'#0#9'MaxLength'#2#0#8'OnChange'#7#16'ComboBoxOnChange'#6'OnE'
  +'xit'#7#14'ComboBoxOnExit'#9'OnKeyDown'#7#17'ComboBoxOnKeyDown'#8'TabOrder'#2
  +#2#0#0#9'TComboBox'#24'ExtraLineSpacingComboBox'#21'AnchorSideTop.Control'#7
  +#24'EditorFontHeightComboBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2
-  +#6#6'Height'#2#29#3'Top'#2'F'#5'Width'#2'd'#16'AutoCompleteText'#11#22'cbact'
+  +#6#6'Height'#2#21#3'Top'#2'6'#5'Width'#2'd'#16'AutoCompleteText'#11#22'cbact'
  +'EndOfLineComplete'#20'cbactSearchAscending'#0#13'Items.Strings'#1#6#1'0'#6#1
  +'1'#6#1'2'#0#9'MaxLength'#2#0#8'OnChange'#7#16'ComboBoxOnChange'#6'OnExit'#7
  +#14'ComboBoxOnExit'#9'OnKeyDown'#7#17'ComboBoxOnKeyDown'#8'TabOrder'#2#4#0#0
  +#9'TComboBox'#24'ExtraCharSpacingComboBox'#21'AnchorSideTop.Control'#7#24'Ex'
  +'traLineSpacingComboBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6
-  ,'Height'#2#29#3'Top'#2'c'#5'Width'#2'd'#16'AutoCompleteText'#11#22'cbactEndO'
+  ,'Height'#2#21#3'Top'#2'K'#5'Width'#2'd'#16'AutoCompleteText'#11#22'cbactEndO'
  +'fLineComplete'#20'cbactSearchAscending'#0#13'Items.Strings'#1#6#1'0'#6#1'1'
  +#6#1'2'#0#9'MaxLength'#2#0#8'OnChange'#7#16'ComboBoxOnChange'#6'OnExit'#7#14
  +'ComboBoxOnExit'#9'OnKeyDown'#7#17'ComboBoxOnKeyDown'#8'TabOrder'#2#3#0#0#0#8
-  +'TSynEdit'#14'DisplayPreview'#4'Left'#2#6#6'Height'#3#163#0#3'Top'#3'&'#1#5
-  +'Width'#3#26#2#5'Align'#7#8'alClient'#20'BorderSpacing.Around'#2#6#11'Font.H'
+  +'TSynEdit'#14'DisplayPreview'#4'Left'#2#6#6'Height'#3#155#0#3'Top'#3'&'#1#5
+  +'Width'#3#24#2#5'Align'#7#8'alClient'#20'BorderSpacing.Around'#2#6#11'Font.H'
  +'eight'#2#240#9'Font.Name'#6#7'courier'#10'Font.Pitch'#7#7'fpFixed'#11'Paren'
-  +'tColor'#8#8'TabOrder'#2#2#24'BookMarkOptions.OnChange'#13#23'Gutter.CodeFol'
-  +'dingWidth'#2#14#10'Keystrokes'#14#1#7'Command'#2#3#8'ShortCut'#2'&'#0#1#7'C'
-  +'ommand'#2'g'#8'ShortCut'#3'& '#0#1#7'Command'#3#211#0#8'ShortCut'#3'&@'#0#1
-  +#7'Command'#2#4#8'ShortCut'#2'('#0#1#7'Command'#2'h'#8'ShortCut'#3'( '#0#1#7
-  +'Command'#3#212#0#8'ShortCut'#3'(@'#0#1#7'Command'#2#1#8'ShortCut'#2'%'#0#1#7
-  +'Command'#2'e'#8'ShortCut'#3'% '#0#1#7'Command'#2#5#8'ShortCut'#3'%@'#0#1#7
-  +'Command'#2'i'#8'ShortCut'#3'%`'#0#1#7'Command'#2#2#8'ShortCut'#2''''#0#1#7
-  +'Command'#2'f'#8'ShortCut'#3''' '#0#1#7'Command'#2#6#8'ShortCut'#3'''@'#0#1#7
-  +'Command'#2'j'#8'ShortCut'#3'''`'#0#1#7'Command'#2#10#8'ShortCut'#2'"'#0#1#7
-  +'Command'#2'n'#8'ShortCut'#3'" '#0#1#7'Command'#2#14#8'ShortCut'#3'"@'#0#1#7
-  +'Command'#2'r'#8'ShortCut'#3'"`'#0#1#7'Command'#2#9#8'ShortCut'#2'!'#0#1#7'C'
-  +'ommand'#2'm'#8'ShortCut'#3'! '#0#1#7'Command'#2#13#8'ShortCut'#3'!@'#0#1#7
-  +'Command'#2'q'#8'ShortCut'#3'!`'#0#1#7'Command'#2#7#8'ShortCut'#2'$'#0#1#7'C'
-  +'ommand'#2'k'#8'ShortCut'#3'$ '#0#1#7'Command'#2#15#8'ShortCut'#3'$@'#0#1#7
-  +'Command'#2's'#8'ShortCut'#3'$`'#0#1#7'Command'#2#8#8'ShortCut'#2'#'#0#1#7'C'
-  +'ommand'#2'l'#8'ShortCut'#3'# '#0#1#7'Command'#2#16#8'ShortCut'#3'#@'#0#1#7
-  +'Command'#2't'#8'ShortCut'#3'#`'#0#1#7'Command'#3#223#0#8'ShortCut'#2'-'#0#1
-  +#7'Command'#3#201#0#8'ShortCut'#3'-@'#0#1#7'Command'#3'\'#2#8'ShortCut'#3'- '
-  +#0#1#7'Command'#3#246#1#8'ShortCut'#2'.'#0#1#7'Command'#3'['#2#8'ShortCut'#3
-  +'. '#0#1#7'Command'#3#245#1#8'ShortCut'#2#8#0#1#7'Command'#3#245#1#8'ShortCu'
-  +'t'#3#8' '#0#1#7'Command'#3#248#1#8'ShortCut'#3#8'@'#0#1#7'Command'#3'Y'#2#8
-  +'ShortCut'#4#8#128#0#0#0#1#7'Command'#3'Z'#2#8'ShortCut'#4#8#160#0#0#0#1#7'C'
-  +'ommand'#3#253#1#8'ShortCut'#2#13#0#1#7'Command'#3#199#0#8'ShortCut'#3'A@'#0
-  +#1#7'Command'#3#201#0#8'ShortCut'#3'C@'#0#1#7'Command'#3'b'#2#8'ShortCut'#3
-  +'I`'#0#1#7'Command'#3#253#1#8'ShortCut'#3'M@'#0#1#7'Command'#3#254#1#8'Short'
-  +'Cut'#3'N@'#0#1#7'Command'#3#247#1#8'ShortCut'#3'T@'#0#1#7'Command'#3'c'#2#8
-  +'ShortCut'#3'U`'#0#1#7'Command'#3'\'#2#8'ShortCut'#3'V@'#0#1#7'Command'#3'['
-  +#2#8'ShortCut'#3'X@'#0#1#7'Command'#3#251#1#8'ShortCut'#3'Y@'#0#1#7'Command'
-  +#3#250#1#8'ShortCut'#3'Y`'#0#1#7'Command'#3'Y'#2#8'ShortCut'#3'Z@'#0#1#7'Com'
-  +'mand'#3'Z'#2#8'ShortCut'#3'Z`'#0#1#7'Command'#3'-'#1#8'ShortCut'#3'0@'#0#1#7
-  +'Command'#3'.'#1#8'ShortCut'#3'1@'#0#1#7'Command'#3'/'#1#8'ShortCut'#3'2@'#0
-  +#1#7'Command'#3'0'#1#8'ShortCut'#3'3@'#0#1#7'Command'#3'1'#1#8'ShortCut'#3'4'
-  +'@'#0#1#7'Command'#3'2'#1#8'ShortCut'#3'5@'#0#1#7'Command'#3'3'#1#8'ShortCut'
-  +#3'6@'#0#1#7'Command'#3'4'#1#8'ShortCut'#3'7@'#0#1#7'Command'#3'5'#1#8'Short'
-  +'Cut'#3'8@'#0#1#7'Command'#3'6'#1#8'ShortCut'#3'9@'#0#1#7'Command'#3'_'#1#8
-  +'ShortCut'#3'0`'#0#1#7'Command'#3'`'#1#8'ShortCut'#3'1`'#0#1#7'Command'#3'a'
-  +#1#8'ShortCut'#3'2`'#0#1#7'Command'#3'b'#1#8'ShortCut'#3'3`'#0#1#7'Command'#3
-  +'c'#1#8'ShortCut'#3'4`'#0#1#7'Command'#3'd'#1#8'ShortCut'#3'5`'#0#1#7'Comman'
-  +'d'#3'e'#1#8'ShortCut'#3'6`'#0#1#7'Command'#3'f'#1#8'ShortCut'#3'7`'#0#1#7'C'
-  +'ommand'#3'g'#1#8'ShortCut'#3'8`'#0#1#7'Command'#3'h'#1#8'ShortCut'#3'9`'#0#1
-  +#7'Command'#3#231#0#8'ShortCut'#3'N`'#0#1#7'Command'#3#232#0#8'ShortCut'#3'C'
-  +'`'#0#1#7'Command'#3#233#0#8'ShortCut'#3'L`'#0#1#7'Command'#3'd'#2#8'ShortCu'
-  +'t'#2#9#0#1#7'Command'#3'e'#2#8'ShortCut'#3#9' '#0#1#7'Command'#3#250#0#8'Sh'
-  +'ortCut'#3'B`'#0#0#13'Lines.Strings'#1#6#14'DisplayPreview'#0#8'ReadOnly'#9
-  +#22'SelectedColor.OnChange'#13#19'OnSpecialLineColors'#7#19'OnSpecialLineCol'
-  +'ors'#0#0#0#5'TPage'#14'KeymappingPage'#7'Caption'#6#14'KeymappingPage'#11'C'
-  +'lientWidth'#3'&'#2#12'ClientHeight'#3#207#1#0#6'TLabel'#19'KeyMappingHelpLa'
-  +'bel'#21'AnchorSideTop.Control'#7#28'KeyMappingChooseSchemeButton'#18'Anchor'
-  +'SideTop.Side'#7#9'asrBottom'#4'Left'#2#8#6'Height'#2#20#3'Top'#2'2'#5'Width'
-  +#3#140#0#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#15#19'BorderSpac'
-  +'ing.Right'#2#6#7'Caption'#6#19'KeyMappingHelpLabel'#11'ParentColor'#8#0#0#7
-  +'TButton'#28'KeyMappingChooseSchemeButton'#22'AnchorSideLeft.Control'#7#14'K'
-  +'eymappingPage'#21'AnchorSideTop.Control'#7#14'KeymappingPage'#4'Left'#2#6#6
-  +'Height'#2#29#3'Top'#2#6#5'Width'#3#232#0#8'AutoSize'#9#18'BorderSpacing.Lef'
-  +'t'#2#6#17'BorderSpacing.Top'#2#6#19'BorderSpacing.Right'#2#6#7'Caption'#6#28
-  +'KeyMappingChooseSchemeButton'#7'OnClick'#7'!KeyMappingChooseSchemeButtonCli'
-  +'ck'#8'TabOrder'#2#0#0#0#7'TButton KeyMappingConsistencyCheckButton'#21'Anch'
-  ,'orSideTop.Control'#7#14'KeymappingPage'#23'AnchorSideRight.Control'#7#14'Ke'
-  +'ymappingPage'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3')'#1#6'Heig'
-  +'ht'#2#29#3'Top'#2#6#5'Width'#3#247#0#7'Anchors'#11#5'akTop'#7'akRight'#0#8
-  +'AutoSize'#9#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#19'BorderS'
-  +'pacing.Right'#2#6#7'Caption'#6' KeyMappingConsistencyCheckButton'#7'OnClick'
-  +#7'%KeyMappingConsistencyCheckButtonClick'#8'TabOrder'#2#1#0#0#9'TTreeView'
-  +#18'KeyMappingTreeView'#21'AnchorSideTop.Control'#7#19'KeyMappingHelpLabel'
-  +#18'AnchorSideTop.Side'#7#9'asrBottom'#21'AnchorSideBottom.Side'#7#9'asrBott'
-  +'om'#4'Left'#2#6#6'Height'#3'}'#1#3'Top'#2'L'#5'Width'#3#26#2#5'Align'#7#8'a'
-  +'lBottom'#7'Anchors'#11#5'akTop'#6'akLeft'#8'akBottom'#0#20'BorderSpacing.Ar'
-  +'ound'#2#6#17'DefaultItemHeight'#2#23#6'Images'#7#9'ImageList'#8'ReadOnly'#9
-  +#9'RowSelect'#9#8'TabOrder'#2#2#9'OnMouseUp'#7#25'KeyMappingTreeViewMouseUp'
-  +#7'Options'#11#17'tvoAutoItemHeight'#16'tvoHideSelection'#21'tvoKeepCollapse'
-  +'dNodes'#11'tvoReadOnly'#12'tvoRowSelect'#14'tvoShowButtons'#12'tvoShowLines'
-  +#11'tvoShowRoot'#17'tvoShowSeparators'#11'tvoToolTips'#0#0#0#0#5'TPage'#9'Co'
-  +'lorPage'#7'Caption'#6#9'ColorPage'#11'ClientWidth'#3'&'#2#12'ClientHeight'#3
-  +#207#1#0#6'TLabel'#13'LanguageLabel'#4'Left'#3#214#0#6'Height'#2#20#3'Top'#2
-  +#12#5'Width'#2'b'#7'Caption'#6#13'LanguageLabel'#11'ParentColor'#8#0#0#6'TLa'
-  +'bel'#16'ColorSchemeLabel'#4'Left'#3#214#0#6'Height'#2#20#3'Top'#2'$'#5'Widt'
-  +'h'#2'y'#7'Caption'#6#16'ColorSchemeLabel'#11'ParentColor'#8#0#0#6'TLabel'#19
-  +'FileExtensionsLabel'#4'Left'#3#214#0#6'Height'#2#20#3'Top'#2'<'#5'Width'#2
-  +'|'#7'Caption'#6#19'FileExtensionsLabel'#11'ParentColor'#8#0#0#6'TLabel'#17
-  +'ColorElementLabel'#4'Left'#2#4#6'Height'#2#20#3'Top'#2'Z'#5'Width'#2'y'#7'C'
-  +'aption'#6#17'ColorElementLabel'#11'ParentColor'#8#0#0#9'TComboBox'#16'Langu'
-  +'ageComboBox'#4'Left'#2#3#6'Height'#2#29#3'Top'#2#10#5'Width'#3#200#0#16'Aut'
-  +'oCompleteText'#11#22'cbactEndOfLineComplete'#20'cbactSearchAscending'#0#9'M'
-  +'axLength'#2#0#8'OnChange'#7#16'ComboBoxOnChange'#6'OnExit'#7#14'ComboBoxOnE'
-  +'xit'#9'OnKeyDown'#7#17'ComboBoxOnKeyDown'#8'TabOrder'#2#0#4'Text'#6#16'Lang'
-  +'uageComboBox'#0#0#9'TComboBox'#19'ColorSchemeComboBox'#4'Left'#2#3#6'Height'
-  +#2#29#3'Top'#2'"'#5'Width'#3#200#0#16'AutoCompleteText'#11#22'cbactEndOfLine'
-  +'Complete'#20'cbactSearchAscending'#0#9'MaxLength'#2#0#8'OnChange'#7#16'Comb'
-  +'oBoxOnChange'#6'OnExit'#7#14'ComboBoxOnExit'#9'OnKeyDown'#7#17'ComboBoxOnKe'
-  +'yDown'#8'TabOrder'#2#1#4'Text'#6#19'ColorSchemeComboBox'#0#0#9'TComboBox'#22
-  +'FileExtensionsComboBox'#4'Left'#2#3#6'Height'#2#29#3'Top'#2':'#5'Width'#3
-  +#200#0#16'AutoCompleteText'#11#22'cbactEndOfLineComplete'#20'cbactSearchAsce'
-  +'nding'#0#13'Items.Strings'#1#6#26'pp;pas;inc;lpr;lrs;dpr;dpk'#6#18'pp;pas;i'
-  +'nc;lpr;lrs'#6#10'pp;pas;inc'#0#9'MaxLength'#2#0#8'OnChange'#7#16'ComboBoxOn'
-  +'Change'#6'OnExit'#7#14'ComboBoxOnExit'#9'OnKeyDown'#7#17'ComboBoxOnKeyDown'
-  +#8'TabOrder'#2#2#0#0#8'TSynEdit'#12'ColorPreview'#4'Left'#2#4#6'Height'#2'd'
-  +#3'Top'#3'g'#1#5'Width'#3#30#2#5'Align'#7#8'alBottom'#20'BorderSpacing.Aroun'
-  +'d'#2#4#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#11'Font.He'
-  +'ight'#2#240#9'Font.Name'#6#7'courier'#10'Font.Pitch'#7#7'fpFixed'#11'Parent'
-  +'Color'#8#8'TabOrder'#2#3#11'OnMouseDown'#7#19'ColorPreviewMouseUp'#24'BookM'
-  +'arkOptions.OnChange'#13#23'Gutter.CodeFoldingWidth'#2#14#10'Keystrokes'#14#1
-  +#7'Command'#2#3#8'ShortCut'#2'&'#0#1#7'Command'#2'g'#8'ShortCut'#3'& '#0#1#7
-  +'Command'#3#211#0#8'ShortCut'#3'&@'#0#1#7'Command'#2#4#8'ShortCut'#2'('#0#1#7
-  +'Command'#2'h'#8'ShortCut'#3'( '#0#1#7'Command'#3#212#0#8'ShortCut'#3'(@'#0#1
-  +#7'Command'#2#1#8'ShortCut'#2'%'#0#1#7'Command'#2'e'#8'ShortCut'#3'% '#0#1#7
-  +'Command'#2#5#8'ShortCut'#3'%@'#0#1#7'Command'#2'i'#8'ShortCut'#3'%`'#0#1#7
+  +'tColor'#8#8'TabOrder'#2#2#23'Gutter.CodeFoldingWidth'#2#14#10'Keystrokes'#14
+  +#1#7'Command'#2#3#8'ShortCut'#2'&'#0#1#7'Command'#2'g'#8'ShortCut'#3'& '#0#1
+  +#7'Command'#3#211#0#8'ShortCut'#3'&@'#0#1#7'Command'#2#4#8'ShortCut'#2'('#0#1
+  +#7'Command'#2'h'#8'ShortCut'#3'( '#0#1#7'Command'#3#212#0#8'ShortCut'#3'(@'#0
+  +#1#7'Command'#2#1#8'ShortCut'#2'%'#0#1#7'Command'#2'e'#8'ShortCut'#3'% '#0#1
+  +#7'Command'#2#5#8'ShortCut'#3'%@'#0#1#7'Command'#2'i'#8'ShortCut'#3'%`'#0#1#7
  +'Command'#2#2#8'ShortCut'#2''''#0#1#7'Command'#2'f'#8'ShortCut'#3''' '#0#1#7
  +'Command'#2#6#8'ShortCut'#3'''@'#0#1#7'Command'#2'j'#8'ShortCut'#3'''`'#0#1#7
  +'Command'#2#10#8'ShortCut'#2'"'#0#1#7'Command'#2'n'#8'ShortCut'#3'" '#0#1#7
@ -257,7 +157,121 @@ LazarusResources.Add('TEditorOptionsForm','FORMDATA',[
  +'.'#0#1#7'Command'#3'['#2#8'ShortCut'#3'. '#0#1#7'Command'#3#245#1#8'ShortCu'
  +'t'#2#8#0#1#7'Command'#3#245#1#8'ShortCut'#3#8' '#0#1#7'Command'#3#248#1#8'S'
  +'hortCut'#3#8'@'#0#1#7'Command'#3'Y'#2#8'ShortCut'#4#8#128#0#0#0#1#7'Command'
-  ,#3'Z'#2#8'ShortCut'#4#8#160#0#0#0#1#7'Command'#3#253#1#8'ShortCut'#2#13#0#1#7
+  +#3'Z'#2#8'ShortCut'#4#8#160#0#0#0#1#7'Command'#3#253#1#8'ShortCut'#2#13#0#1#7
+  +'Command'#3#199#0#8'ShortCut'#3'A@'#0#1#7'Command'#3#201#0#8'ShortCut'#3'C@'
+  +#0#1#7'Command'#3'b'#2#8'ShortCut'#3'I`'#0#1#7'Command'#3#253#1#8'ShortCut'#3
+  +'M@'#0#1#7'Command'#3#254#1#8'ShortCut'#3'N@'#0#1#7'Command'#3#247#1#8'Short'
+  +'Cut'#3'T@'#0#1#7'Command'#3'c'#2#8'ShortCut'#3'U`'#0#1#7'Command'#3'\'#2#8
+  +'ShortCut'#3'V@'#0#1#7'Command'#3'['#2#8'ShortCut'#3'X@'#0#1#7'Command'#3#251
+  +#1#8'ShortCut'#3'Y@'#0#1#7'Command'#3#250#1#8'ShortCut'#3'Y`'#0#1#7'Command'
+  +#3'Y'#2#8'ShortCut'#3'Z@'#0#1#7'Command'#3'Z'#2#8'ShortCut'#3'Z`'#0#1#7'Comm'
+  +'and'#3'-'#1#8'ShortCut'#3'0@'#0#1#7'Command'#3'.'#1#8'ShortCut'#3'1@'#0#1#7
+  +'Command'#3'/'#1#8'ShortCut'#3'2@'#0#1#7'Command'#3'0'#1#8'ShortCut'#3'3@'#0
+  +#1#7'Command'#3'1'#1#8'ShortCut'#3'4@'#0#1#7'Command'#3'2'#1#8'ShortCut'#3'5'
+  +'@'#0#1#7'Command'#3'3'#1#8'ShortCut'#3'6@'#0#1#7'Command'#3'4'#1#8'ShortCut'
+  +#3'7@'#0#1#7'Command'#3'5'#1#8'ShortCut'#3'8@'#0#1#7'Command'#3'6'#1#8'Short'
+  +'Cut'#3'9@'#0#1#7'Command'#3'_'#1#8'ShortCut'#3'0`'#0#1#7'Command'#3'`'#1#8
+  +'ShortCut'#3'1`'#0#1#7'Command'#3'a'#1#8'ShortCut'#3'2`'#0#1#7'Command'#3'b'
+  +#1#8'ShortCut'#3'3`'#0#1#7'Command'#3'c'#1#8'ShortCut'#3'4`'#0#1#7'Command'#3
+  +'d'#1#8'ShortCut'#3'5`'#0#1#7'Command'#3'e'#1#8'ShortCut'#3'6`'#0#1#7'Comman'
+  +'d'#3'f'#1#8'ShortCut'#3'7`'#0#1#7'Command'#3'g'#1#8'ShortCut'#3'8`'#0#1#7'C'
+  +'ommand'#3'h'#1#8'ShortCut'#3'9`'#0#1#7'Command'#3#231#0#8'ShortCut'#3'N`'#0
+  +#1#7'Command'#3#232#0#8'ShortCut'#3'C`'#0#1#7'Command'#3#233#0#8'ShortCut'#3
+  +'L`'#0#1#7'Command'#3'd'#2#8'ShortCut'#2#9#0#1#7'Command'#3'e'#2#8'ShortCut'
+  +#3#9' '#0#1#7'Command'#3#250#0#8'ShortCut'#3'B`'#0#0#13'Lines.Strings'#1#6#14
+  +'DisplayPreview'#0#8'ReadOnly'#9#19'OnSpecialLineColors'#7#19'OnSpecialLineC'
+  +'olors'#0#0#0#5'TPage'#14'KeymappingPage'#7'Caption'#6#14'KeymappingPage'#11
+  +'ClientWidth'#3'$'#2#12'ClientHeight'#3#199#1#0#6'TLabel'#19'KeyMappingHelpL'
+  +'abel'#21'AnchorSideTop.Control'#7#14'KeymappingPage'#4'Left'#2#8#6'Height'#2
+  +#18#3'Top'#2#6#5'Width'#3#137#0#18'BorderSpacing.Left'#2#6#17'BorderSpacing.'
+  +'Top'#2#6#19'BorderSpacing.Right'#2#6#7'Caption'#6#19'KeyMappingHelpLabel'#11
+  +'ParentColor'#8#0#0#7'TButton'#28'KeyMappingChooseSchemeButton'#22'AnchorSid'
+  +'eLeft.Control'#7#14'KeymappingPage'#21'AnchorSideTop.Control'#7#14'Keymappi'
+  +'ngPage'#24'AnchorSideBottom.Control'#7#14'KeymappingPage'#21'AnchorSideBott'
+  +'om.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#20#3'Top'#3#173#1#5'Width'#3
+  +#242#0#7'Anchors'#11#6'akLeft'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.'
+  +'Around'#2#6#7'Caption'#6#28'KeyMappingChooseSchemeButton'#7'OnClick'#7'!Key'
+  +'MappingChooseSchemeButtonClick'#8'TabOrder'#2#0#0#0#7'TButton KeyMappingCon'
+  +'sistencyCheckButton'#21'AnchorSideTop.Control'#7#14'KeymappingPage'#23'Anch'
+  ,'orSideRight.Control'#7#14'KeymappingPage'#20'AnchorSideRight.Side'#7#9'asrB'
+  +'ottom'#24'AnchorSideBottom.Control'#7#14'KeymappingPage'#21'AnchorSideBotto'
+  +'m.Side'#7#9'asrBottom'#4'Left'#3#25#1#6'Height'#2#20#3'Top'#3#173#1#5'Width'
+  +#3#5#1#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacing'
+  +'.Around'#2#6#7'Caption'#6' KeyMappingConsistencyCheckButton'#7'OnClick'#7'%'
+  +'KeyMappingConsistencyCheckButtonClick'#8'TabOrder'#2#1#0#0#9'TTreeView'#18
+  +'KeyMappingTreeView'#22'AnchorSideLeft.Control'#7#14'KeymappingPage'#21'Anch'
+  +'orSideTop.Control'#7#20'KeyMappingFilterEdit'#18'AnchorSideTop.Side'#7#9'as'
+  +'rBottom'#23'AnchorSideRight.Control'#7#14'KeymappingPage'#20'AnchorSideRigh'
+  +'t.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#23'KeyMappingFindKeyB'
+  +'utton'#4'Left'#2#6#6'Height'#3'Y'#1#3'Top'#2'4'#5'Width'#3#24#2#7'Anchors'
+  +#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#20'BorderSpacing.Around'#2#6
+  +#17'DefaultItemHeight'#2#21#6'Images'#7#9'ImageList'#8'ReadOnly'#9#9'RowSele'
+  +'ct'#9#8'TabOrder'#2#2#9'OnMouseUp'#7#25'KeyMappingTreeViewMouseUp'#7'Option'
+  +'s'#11#17'tvoAutoItemHeight'#16'tvoHideSelection'#21'tvoKeepCollapsedNodes'
+  +#11'tvoReadOnly'#12'tvoRowSelect'#14'tvoShowButtons'#12'tvoShowLines'#11'tvo'
+  +'ShowRoot'#17'tvoShowSeparators'#11'tvoToolTips'#0#0#0#5'TEdit'#20'KeyMappin'
+  +'gFilterEdit'#22'AnchorSideLeft.Control'#7#14'KeymappingPage'#21'AnchorSideT'
+  +'op.Control'#7#19'KeyMappingHelpLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'
+  +#23'AnchorSideRight.Control'#7#14'KeymappingPage'#20'AnchorSideRight.Side'#7
+  +#9'asrBottom'#4'Left'#2#6#6'Height'#2#16#3'Top'#2#30#5'Width'#3#24#2#7'Ancho'
+  +'rs'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'AutoSize'#9#20'BorderSpacing.Aroun'
+  +'d'#2#6#8'OnChange'#7#26'KeyMappingFilterEditChange'#8'TabOrder'#2#3#4'Text'
+  +#6#20'KeyMappingFilterEdit'#0#0#7'TButton'#23'KeyMappingFindKeyButton'#22'An'
+  +'chorSideLeft.Control'#7#14'KeymappingPage'#20'AnchorSideRight.Side'#7#9'asr'
+  +'Bottom'#24'AnchorSideBottom.Control'#7#28'KeyMappingChooseSchemeButton'#4'L'
+  +'eft'#2#6#6'Height'#2#20#3'Top'#3#147#1#5'Width'#3#197#0#7'Anchors'#11#6'akL'
+  +'eft'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6
+  +#23'KeyMappingFindKeyButton'#7'OnClick'#7#28'KeyMappingFindKeyButtonClick'#8
+  +'TabOrder'#2#4#0#0#0#5'TPage'#9'ColorPage'#7'Caption'#6#9'ColorPage'#11'Clie'
+  +'ntWidth'#3'&'#2#12'ClientHeight'#3#207#1#0#6'TLabel'#13'LanguageLabel'#4'Le'
+  +'ft'#3#214#0#6'Height'#2#20#3'Top'#2#12#5'Width'#2'b'#7'Caption'#6#13'Langua'
+  +'geLabel'#11'ParentColor'#8#0#0#6'TLabel'#16'ColorSchemeLabel'#4'Left'#3#214
+  +#0#6'Height'#2#20#3'Top'#2'$'#5'Width'#2'y'#7'Caption'#6#16'ColorSchemeLabel'
+  +#11'ParentColor'#8#0#0#6'TLabel'#19'FileExtensionsLabel'#4'Left'#3#214#0#6'H'
+  +'eight'#2#20#3'Top'#2'<'#5'Width'#2'|'#7'Caption'#6#19'FileExtensionsLabel'
+  +#11'ParentColor'#8#0#0#6'TLabel'#17'ColorElementLabel'#4'Left'#2#4#6'Height'
+  +#2#20#3'Top'#2'Z'#5'Width'#2'y'#7'Caption'#6#17'ColorElementLabel'#11'Parent'
+  +'Color'#8#0#0#9'TComboBox'#16'LanguageComboBox'#4'Left'#2#3#6'Height'#2#21#3
+  +'Top'#2#10#5'Width'#3#200#0#16'AutoCompleteText'#11#22'cbactEndOfLineComplet'
+  +'e'#20'cbactSearchAscending'#0#9'MaxLength'#2#0#8'OnChange'#7#16'ComboBoxOnC'
+  +'hange'#6'OnExit'#7#14'ComboBoxOnExit'#9'OnKeyDown'#7#17'ComboBoxOnKeyDown'#8
+  +'TabOrder'#2#0#4'Text'#6#16'LanguageComboBox'#0#0#9'TComboBox'#19'ColorSchem'
+  +'eComboBox'#4'Left'#2#3#6'Height'#2#21#3'Top'#2'"'#5'Width'#3#200#0#16'AutoC'
+  +'ompleteText'#11#22'cbactEndOfLineComplete'#20'cbactSearchAscending'#0#9'Max'
+  +'Length'#2#0#8'OnChange'#7#16'ComboBoxOnChange'#6'OnExit'#7#14'ComboBoxOnExi'
+  +'t'#9'OnKeyDown'#7#17'ComboBoxOnKeyDown'#8'TabOrder'#2#1#4'Text'#6#19'ColorS'
+  +'chemeComboBox'#0#0#9'TComboBox'#22'FileExtensionsComboBox'#4'Left'#2#3#6'He'
+  +'ight'#2#21#3'Top'#2':'#5'Width'#3#200#0#16'AutoCompleteText'#11#22'cbactEnd'
+  +'OfLineComplete'#20'cbactSearchAscending'#0#13'Items.Strings'#1#6#26'pp;pas;'
+  +'inc;lpr;lrs;dpr;dpk'#6#18'pp;pas;inc;lpr;lrs'#6#10'pp;pas;inc'#0#9'MaxLengt'
+  +'h'#2#0#8'OnChange'#7#16'ComboBoxOnChange'#6'OnExit'#7#14'ComboBoxOnExit'#9
+  +'OnKeyDown'#7#17'ComboBoxOnKeyDown'#8'TabOrder'#2#2#0#0#8'TSynEdit'#12'Color'
+  +'Preview'#4'Left'#2#4#6'Height'#2'd'#3'Top'#3'g'#1#5'Width'#3#30#2#5'Align'#7
+  +#8'alBottom'#20'BorderSpacing.Around'#2#4#7'Anchors'#11#5'akTop'#6'akLeft'#7
+  +'akRight'#8'akBottom'#0#11'Font.Height'#2#240#9'Font.Name'#6#7'courier'#10'F'
+  +'ont.Pitch'#7#7'fpFixed'#11'ParentColor'#8#8'TabOrder'#2#3#11'OnMouseDown'#7
+  +#19'ColorPreviewMouseUp'#23'Gutter.CodeFoldingWidth'#2#14#10'Keystrokes'#14#1
+  +#7'Command'#2#3#8'ShortCut'#2'&'#0#1#7'Command'#2'g'#8'ShortCut'#3'& '#0#1#7
+  +'Command'#3#211#0#8'ShortCut'#3'&@'#0#1#7'Command'#2#4#8'ShortCut'#2'('#0#1#7
+  +'Command'#2'h'#8'ShortCut'#3'( '#0#1#7'Command'#3#212#0#8'ShortCut'#3'(@'#0#1
+  +#7'Command'#2#1#8'ShortCut'#2'%'#0#1#7'Command'#2'e'#8'ShortCut'#3'% '#0#1#7
+  +'Command'#2#5#8'ShortCut'#3'%@'#0#1#7'Command'#2'i'#8'ShortCut'#3'%`'#0#1#7
+  +'Command'#2#2#8'ShortCut'#2''''#0#1#7'Command'#2'f'#8'ShortCut'#3''' '#0#1#7
+  ,'Command'#2#6#8'ShortCut'#3'''@'#0#1#7'Command'#2'j'#8'ShortCut'#3'''`'#0#1#7
+  +'Command'#2#10#8'ShortCut'#2'"'#0#1#7'Command'#2'n'#8'ShortCut'#3'" '#0#1#7
+  +'Command'#2#14#8'ShortCut'#3'"@'#0#1#7'Command'#2'r'#8'ShortCut'#3'"`'#0#1#7
+  +'Command'#2#9#8'ShortCut'#2'!'#0#1#7'Command'#2'm'#8'ShortCut'#3'! '#0#1#7'C'
+  +'ommand'#2#13#8'ShortCut'#3'!@'#0#1#7'Command'#2'q'#8'ShortCut'#3'!`'#0#1#7
+  +'Command'#2#7#8'ShortCut'#2'$'#0#1#7'Command'#2'k'#8'ShortCut'#3'$ '#0#1#7'C'
+  +'ommand'#2#15#8'ShortCut'#3'$@'#0#1#7'Command'#2's'#8'ShortCut'#3'$`'#0#1#7
+  +'Command'#2#8#8'ShortCut'#2'#'#0#1#7'Command'#2'l'#8'ShortCut'#3'# '#0#1#7'C'
+  +'ommand'#2#16#8'ShortCut'#3'#@'#0#1#7'Command'#2't'#8'ShortCut'#3'#`'#0#1#7
+  +'Command'#3#223#0#8'ShortCut'#2'-'#0#1#7'Command'#3#201#0#8'ShortCut'#3'-@'#0
+  +#1#7'Command'#3'\'#2#8'ShortCut'#3'- '#0#1#7'Command'#3#246#1#8'ShortCut'#2
+  +'.'#0#1#7'Command'#3'['#2#8'ShortCut'#3'. '#0#1#7'Command'#3#245#1#8'ShortCu'
+  +'t'#2#8#0#1#7'Command'#3#245#1#8'ShortCut'#3#8' '#0#1#7'Command'#3#248#1#8'S'
+  +'hortCut'#3#8'@'#0#1#7'Command'#3'Y'#2#8'ShortCut'#4#8#128#0#0#0#1#7'Command'
+  +#3'Z'#2#8'ShortCut'#4#8#160#0#0#0#1#7'Command'#3#253#1#8'ShortCut'#2#13#0#1#7
  +'Command'#3#199#0#8'ShortCut'#3'A@'#0#1#7'Command'#3#201#0#8'ShortCut'#3'C@'
  +#0#1#7'Command'#3'b'#2#8'ShortCut'#3'I`'#0#1#7'Command'#3#253#1#8'ShortCut'#3
  +'M@'#0#1#7'Command'#3#254#1#8'ShortCut'#3'N@'#0#1#7'Command'#3#247#1#8'Short'
@ -279,114 +293,113 @@ LazarusResources.Add('TEditorOptionsForm','FORMDATA',[
  +#1#7'Command'#3#232#0#8'ShortCut'#3'C`'#0#1#7'Command'#3#233#0#8'ShortCut'#3
  +'L`'#0#1#7'Command'#3'd'#2#8'ShortCut'#2#9#0#1#7'Command'#3'e'#2#8'ShortCut'
  +#3#9' '#0#1#7'Command'#3#250#0#8'ShortCut'#3'B`'#0#0#13'Lines.Strings'#1#6#12
-  +'ColorPreview'#0#8'ReadOnly'#9#22'SelectedColor.OnChange'#13#19'OnSpecialLin'
-  +'eColors'#7#19'OnSpecialLineColors'#0#0#8'TListBox'#19'ColorElementListBox'#4
-  +'Left'#2#3#6'Height'#3#242#0#3'Top'#2'l'#5'Width'#3#200#0#16'ClickOnSelChang'
-  +'e'#8#7'OnClick'#7#24'ColorElementListBoxClick'#17'OnSelectionChange'#7'"Col'
-  +'orElementListBoxSelectionChange'#8'TabOrder'#2#4#8'TopIndex'#2#255#0#0#7'TB'
-  +'utton'#27'SetAttributeToDefaultButton'#23'AnchorSideRight.Control'#7#9'Colo'
-  +'rPage'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#212#0#6'Height'#2
-  +#25#3'Top'#2'Z'#5'Width'#3'L'#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0
-  +#20'BorderSpacing.Around'#2#6#7'Caption'#6#27'SetAttributeToDefaultButton'#7
-  +'OnClick'#7' SetAttributeToDefaultButtonClick'#8'TabOrder'#2#5#0#0#7'TButton'
-  +#31'SetAllAttributesToDefaultButton'#23'AnchorSideRight.Control'#7#9'ColorPa'
-  +'ge'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#212#0#6'Height'#2#25#3
-  +'Top'#2'z'#5'Width'#3'L'#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#20
-  +'BorderSpacing.Around'#2#6#7'Caption'#6#31'SetAllAttributesToDefaultButton'#7
-  +'OnClick'#7'$SetAllAttributesToDefaultButtonClick'#8'TabOrder'#2#6#0#0#9'TGr'
-  +'oupBox'#22'TextAttributesGroupBox'#23'AnchorSideRight.Control'#7#9'ColorPag'
-  +'e'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#12
-  +'ColorPreview'#4'Left'#3#212#0#6'Height'#3#199#0#3'Top'#3#154#0#5'Width'#3'L'
-  +#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#20'BorderSpacin'
-  +'g.Around'#2#6#7'Caption'#6#10'Attributes'#12'ClientHeight'#3#180#0#11'Clien'
-  +'tWidth'#3'H'#1#8'TabOrder'#2#7#0#6'TLabel'#15'ForeGroundLabel'#4'Left'#2#8#6
-  +'Height'#2#20#5'Width'#2'n'#7'Caption'#6#15'ForeGroundLabel'#11'ParentColor'
-  +#8#0#0#12'TColorButton'#21'ForegroundColorButton'#21'AnchorSideTop.Control'#7
-  +#15'ForeGroundLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#8#6'Hei'
-  +'ght'#2#21#3'Top'#2#22#5'Width'#2'K'#17'BorderSpacing.Top'#2#2#11'BorderWidt'
-  +'h'#2#2#15'ButtonColorSize'#2#16#5'Color'#7#9'clBtnFace'#14'OnColorChanged'#7
-  +#23'ColorButtonColorChanged'#0#0#12'TColorButton'#21'BackGroundColorButton'
-  +#21'AnchorSideTop.Control'#7#15'BackGroundLabel'#18'AnchorSideTop.Side'#7#9
-  +'asrBottom'#4'Left'#2#8#6'Height'#2#21#3'Top'#2'F'#5'Width'#2'K'#17'BorderSp'
-  +'acing.Top'#2#2#11'BorderWidth'#2#2#15'ButtonColorSize'#2#16#5'Color'#7#9'cl'
-  +'BtnFace'#14'OnColorChanged'#7#23'ColorButtonColorChanged'#0#0#6'TLabel'#15
-  +'BackGroundLabel'#21'AnchorSideTop.Control'#7#15'ForeGroundLabel'#18'AnchorS'
-  +'ideTop.Side'#7#9'asrBottom'#4'Left'#2#8#6'Height'#2#20#3'Top'#2'0'#5'Width'
-  +#2'q'#17'BorderSpacing.Top'#2#28#7'Caption'#6#15'BackGroundLabel'#11'ParentC'
-  +'olor'#8#0#0#9'TCheckBox'#28'ForeGroundUseDefaultCheckBox'#21'AnchorSideTop.'
-  +'Control'#7#15'ForeGroundLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'
-  +#2'^'#6'Height'#2#22#3'Top'#2#22#5'Width'#3#201#0#7'Anchors'#11#5'akTop'#6'a'
-  +'kLeft'#7'akRight'#0#17'BorderSpacing.Top'#2#2#7'Caption'#6#28'ForeGroundUse'
-  +'DefaultCheckBox'#8'OnChange'#7#23'GeneralCheckBoxOnChange'#8'TabOrder'#2#0#0
-  +#0#9'TCheckBox'#28'BackGroundUseDefaultCheckBox'#21'AnchorSideTop.Control'#7
-  +#15'BackGroundLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2'^'#6'He'
-  +'ight'#2#22#3'Top'#2'D'#5'Width'#3#201#0#7'Anchors'#11#5'akTop'#6'akLeft'#7
-  ,'akRight'#0#19'BorderSpacing.Right'#2#2#7'Caption'#6#28'BackGroundUseDefault'
-  +'CheckBox'#8'OnChange'#7#23'GeneralCheckBoxOnChange'#8'TabOrder'#2#1#0#0#9'T'
-  +'CheckBox'#16'TextBoldCheckBox'#4'Left'#2#6#6'Height'#2#22#3'Top'#2'`'#5'Wid'
-  +'th'#3'<'#1#5'Align'#7#8'alBottom'#20'BorderSpacing.Around'#2#6#7'Caption'#6
-  +#16'TextBoldCheckBox'#8'OnChange'#7#23'GeneralCheckBoxOnChange'#8'TabOrder'#2
-  +#2#0#0#9'TCheckBox'#18'TextItalicCheckBox'#4'Left'#2#6#6'Height'#2#22#3'Top'
-  +#2'|'#5'Width'#3'<'#1#5'Align'#7#8'alBottom'#20'BorderSpacing.Around'#2#6#7
-  +'Caption'#6#18'TextItalicCheckBox'#8'OnChange'#7#23'GeneralCheckBoxOnChange'
-  +#8'TabOrder'#2#3#0#0#9'TCheckBox'#21'TextUnderlineCheckBox'#4'Left'#2#6#6'He'
-  +'ight'#2#22#3'Top'#3#152#0#5'Width'#3'<'#1#5'Align'#7#8'alBottom'#20'BorderS'
-  +'pacing.Around'#2#6#7'Caption'#6#21'TextUnderlineCheckBox'#8'OnChange'#7#23
-  +'GeneralCheckBoxOnChange'#8'TabOrder'#2#4#0#0#0#0#5'TPage'#13'CodetoolsPage'
-  +#7'Caption'#6#13'CodetoolsPage'#11'ClientWidth'#3'&'#2#12'ClientHeight'#3#207
-  +#1#0#9'TGroupBox'#25'AutomaticFeaturesGroupBox'#4'Left'#2#6#6'Height'#3#195#1
-  +#3'Top'#2#6#5'Width'#3#26#2#5'Align'#7#8'alClient'#20'BorderSpacing.Around'#2
-  +#6#7'Caption'#6#25'AutomaticFeaturesGroupBox'#12'ClientHeight'#3#176#1#11'Cl'
-  +'ientWidth'#3#22#2#8'TabOrder'#2#0#0#6'TLabel'#14'AutoDelayLabel'#4'Left'#2#6
-  +#6'Height'#2#20#3'Top'#3#188#0#5'Width'#3#10#2#5'Align'#7#5'alTop'#17'Border'
-  +'Spacing.Top'#2#24#20'BorderSpacing.Around'#2#6#7'Caption'#6#14'AutoDelayLab'
-  +'el'#11'ParentColor'#8#0#0#6'TLabel'#17'AutoDelayMinLabel'#21'AnchorSideTop.'
-  +'Control'#7#17'AutoDelayTrackBar'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Le'
-  +'ft'#2#6#6'Height'#2#20#3'Top'#3#160#0#5'Width'#2'{'#17'BorderSpacing.Top'#2
-  +#2#7'Caption'#6#17'AutoDelayMinLabel'#11'ParentColor'#8#0#0#6'TLabel'#17'Aut'
-  +'oDelayMaxLabel'#21'AnchorSideTop.Control'#7#17'AutoDelayTrackBar'#18'Anchor'
-  +'SideTop.Side'#7#9'asrBottom'#4'Left'#3#133#1#6'Height'#2#20#3'Top'#3#160#0#5
-  +'Width'#2''#9'Alignment'#7#14'taRightJustify'#7'Anchors'#11#5'akTop'#7'akRi'
-  +'ght'#0#17'BorderSpacing.Top'#2#2#7'Caption'#6#17'AutoDelayMaxLabel'#11'Pare'
-  +'ntColor'#8#0#0#9'TCheckBox AutoIdentifierCompletionCheckBox'#4'Left'#2#6#6
-  +'Height'#2#22#3'Top'#2#6#5'Width'#3#10#2#5'Align'#7#5'alTop'#20'BorderSpacin'
-  +'g.Around'#2#6#7'Caption'#6' AutoIdentifierCompletionCheckBox'#8'TabOrder'#2
-  +#0#0#0#9'TCheckBox'#26'AutoCodeParametersCheckBox'#4'Left'#2#6#6'Height'#2#22
-  +#3'Top'#2'>'#5'Width'#3#10#2#5'Align'#7#5'alTop'#20'BorderSpacing.Around'#2#6
-  +#7'Caption'#6#26'AutoCodeParametersCheckBox'#7'Enabled'#8#8'TabOrder'#2#1#0#0
-  +#9'TCheckBox'#27'AutoToolTipExprEvalCheckBox'#4'Left'#2#6#6'Height'#2#22#3'T'
-  +'op'#2'Z'#5'Width'#3#10#2#5'Align'#7#5'alTop'#20'BorderSpacing.Around'#2#6#7
-  +'Caption'#6#27'AutoToolTipExprEvalCheckBox'#8'TabOrder'#2#2#0#0#9'TCheckBox'
-  +#28'AutoToolTipSymbToolsCheckBox'#4'Left'#2#6#6'Height'#2#22#3'Top'#2'"'#5'W'
-  +'idth'#3#10#2#5'Align'#7#5'alTop'#20'BorderSpacing.Around'#2#6#7'Caption'#6
-  +#28'AutoToolTipSymbToolsCheckBox'#8'TabOrder'#2#3#0#0#9'TTrackBar'#17'AutoDe'
-  +'layTrackBar'#4'Left'#2#6#6'Height'#2'('#3'Top'#2'v'#5'Width'#3#10#2#9'Frequ'
-  +'ency'#3#250#0#3'Max'#3#160#15#3'Min'#3#244#1#8'Position'#3#244#1#8'ScalePos'
-  +#7#5'trTop'#5'Align'#7#5'alTop'#18'BorderSpacing.Left'#2#6#17'BorderSpacing.'
-  +'Top'#2#6#19'BorderSpacing.Right'#2#6#8'TabOrder'#2#4#0#0#0#0#5'TPage'#11'Co'
-  +'deFolding'#7'Caption'#6#11'CodeFolding'#11'ClientWidth'#3'&'#2#12'ClientHei'
-  +'ght'#3#207#1#0#6'TLabel'#19'lblDividerDrawLevel'#4'Left'#2#6#6'Height'#2#20
-  +#3'Top'#2'G'#5'Width'#2'|'#7'Caption'#6#19'lblDividerDrawLevel'#11'ParentCol'
-  +'or'#8#0#0#6'TBevel'#6'Bevel1'#4'Left'#2#6#6'Height'#2#2#3'Top'#2'1'#5'Width'
-  +#3#25#2#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#0#0#9'TCheckBox'#21'ch'
-  +'kCodeFoldingEnabled'#4'Left'#2#6#6'Height'#2#22#3'Top'#2#23#5'Width'#3#175#0
-  +#7'Caption'#6#21'chkCodeFoldingEnabled'#8'OnChange'#7#27'chkCodeFoldingEnabl'
-  +'edChange'#8'TabOrder'#2#0#0#0#9'TSpinEdit'#18'edDividerDrawLevel'#4'Left'#3
-  +#211#0#6'Height'#2#23#3'Top'#2'B'#5'Width'#2'2'#8'MaxValue'#2#10#8'MinValue'
-  +#2#1#8'TabOrder'#2#1#5'Value'#2#1#0#0#0#0#6'TPanel'#8'BtnPanel'#6'Height'#2
-  +')'#3'Top'#3#244#1#5'Width'#3'*'#2#5'Align'#7#8'alBottom'#8'AutoSize'#9#10'B'
-  +'evelOuter'#7#6'bvNone'#12'ClientHeight'#2')'#11'ClientWidth'#3'*'#2#8'TabOr'
-  +'der'#2#1#0#7'TButton'#8'OkButton'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4
-  +'Left'#3'q'#1#6'Height'#2#29#3'Top'#2#6#5'Width'#2'K'#5'Align'#7#7'alRight'#8
-  +'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#8'OkButton'#20'Constr'
-  +'aints.MinWidth'#2'K'#7'OnClick'#7#13'OkButtonClick'#8'TabOrder'#2#0#0#0#7'T'
-  +'Button'#12'CancelButton'#20'AnchorSideRight.Side'#7#9'asrBottom'#21'AnchorS'
-  +'ideBottom.Side'#7#9'asrBottom'#4'Left'#3#194#1#6'Height'#2#29#3'Top'#2#6#5
-  +'Width'#2'b'#5'Align'#7#7'alRight'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6
-  +#7'Caption'#6#12'CancelButton'#20'Constraints.MinWidth'#2'K'#7'OnClick'#7#17
-  +'CancelButtonClick'#8'TabOrder'#2#1#0#0#0#10'TImageList'#9'ImageList'#6'Heig'
-  ,'ht'#2#21#5'Width'#2#21#4'left'#3#144#1#3'top'#2'('#6'Bitmap'#10#214#13#0#0
-  +'Li'#2#0#0#0#21#0#0#0#21#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
+  +'ColorPreview'#0#8'ReadOnly'#9#19'OnSpecialLineColors'#7#19'OnSpecialLineCol'
+  +'ors'#0#0#8'TListBox'#19'ColorElementListBox'#4'Left'#2#3#6'Height'#3#242#0#3
+  +'Top'#2'l'#5'Width'#3#200#0#16'ClickOnSelChange'#8#7'OnClick'#7#24'ColorElem'
+  +'entListBoxClick'#17'OnSelectionChange'#7'"ColorElementListBoxSelectionChang'
+  +'e'#8'TabOrder'#2#4#0#0#7'TButton'#27'SetAttributeToDefaultButton'#23'Anchor'
+  +'SideRight.Control'#7#9'ColorPage'#20'AnchorSideRight.Side'#7#9'asrBottom'#4
+  +'Left'#3#212#0#6'Height'#2#25#3'Top'#2'Z'#5'Width'#3'L'#1#7'Anchors'#11#5'ak'
+  +'Top'#6'akLeft'#7'akRight'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#27'Se'
+  +'tAttributeToDefaultButton'#7'OnClick'#7' SetAttributeToDefaultButtonClick'#8
+  +'TabOrder'#2#5#0#0#7'TButton'#31'SetAllAttributesToDefaultButton'#23'AnchorS'
+  +'ideRight.Control'#7#9'ColorPage'#20'AnchorSideRight.Side'#7#9'asrBottom'#4
+  +'Left'#3#212#0#6'Height'#2#25#3'Top'#2'z'#5'Width'#3'L'#1#7'Anchors'#11#5'ak'
+  +'Top'#6'akLeft'#7'akRight'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#31'Se'
+  +'tAllAttributesToDefaultButton'#7'OnClick'#7'$SetAllAttributesToDefaultButto'
+  +'nClick'#8'TabOrder'#2#6#0#0#9'TGroupBox'#22'TextAttributesGroupBox'#23'Anch'
+  +'orSideRight.Control'#7#9'ColorPage'#20'AnchorSideRight.Side'#7#9'asrBottom'
+  +#24'AnchorSideBottom.Control'#7#12'ColorPreview'#4'Left'#3#212#0#6'Height'#3
+  +#199#0#3'Top'#3#154#0#5'Width'#3'L'#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akR'
+  +'ight'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#10'Attributes'
+  +#12'ClientHeight'#3#177#0#11'ClientWidth'#3'D'#1#8'TabOrder'#2#7#0#6'TLabel'
+  +#15'ForeGroundLabel'#4'Left'#2#8#6'Height'#2#20#5'Width'#2'n'#7'Caption'#6#15
+  +'ForeGroundLabel'#11'ParentColor'#8#0#0#12'TColorButton'#21'ForegroundColorB'
+  +'utton'#21'AnchorSideTop.Control'#7#15'ForeGroundLabel'#18'AnchorSideTop.Sid'
+  +'e'#7#9'asrBottom'#4'Left'#2#8#6'Height'#2#21#3'Top'#2#22#5'Width'#2'K'#17'B'
+  +'orderSpacing.Top'#2#2#11'BorderWidth'#2#2#15'ButtonColorSize'#2#16#5'Color'
+  +#7#9'clBtnFace'#14'OnColorChanged'#7#23'ColorButtonColorChanged'#0#0#12'TCol'
+  +'orButton'#21'BackGroundColorButton'#21'AnchorSideTop.Control'#7#15'BackGrou'
+  +'ndLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#8#6'Height'#2#21#3
+  ,'Top'#2'F'#5'Width'#2'K'#17'BorderSpacing.Top'#2#2#11'BorderWidth'#2#2#15'Bu'
+  +'ttonColorSize'#2#16#5'Color'#7#9'clBtnFace'#14'OnColorChanged'#7#23'ColorBu'
+  +'ttonColorChanged'#0#0#6'TLabel'#15'BackGroundLabel'#21'AnchorSideTop.Contro'
+  +'l'#7#15'ForeGroundLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#8#6
+  +'Height'#2#20#3'Top'#2'0'#5'Width'#2'q'#17'BorderSpacing.Top'#2#28#7'Caption'
+  +#6#15'BackGroundLabel'#11'ParentColor'#8#0#0#9'TCheckBox'#28'ForeGroundUseDe'
+  +'faultCheckBox'#21'AnchorSideTop.Control'#7#15'ForeGroundLabel'#18'AnchorSid'
+  +'eTop.Side'#7#9'asrBottom'#4'Left'#2'^'#6'Height'#2#22#3'Top'#2#22#5'Width'#3
+  +#197#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#17'BorderSpacing.Top'#2
+  +#2#7'Caption'#6#28'ForeGroundUseDefaultCheckBox'#8'OnChange'#7#23'GeneralChe'
+  +'ckBoxOnChange'#8'TabOrder'#2#0#0#0#9'TCheckBox'#28'BackGroundUseDefaultChec'
+  +'kBox'#21'AnchorSideTop.Control'#7#15'BackGroundLabel'#18'AnchorSideTop.Side'
+  +#7#9'asrBottom'#4'Left'#2'^'#6'Height'#2#22#3'Top'#2'D'#5'Width'#3#197#0#7'A'
+  +'nchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#19'BorderSpacing.Right'#2#2#7'Ca'
+  +'ption'#6#28'BackGroundUseDefaultCheckBox'#8'OnChange'#7#23'GeneralCheckBoxO'
+  +'nChange'#8'TabOrder'#2#1#0#0#9'TCheckBox'#16'TextBoldCheckBox'#4'Left'#2#6#6
+  +'Height'#2#22#3'Top'#2']'#5'Width'#3'8'#1#5'Align'#7#8'alBottom'#20'BorderSp'
+  +'acing.Around'#2#6#7'Caption'#6#16'TextBoldCheckBox'#8'OnChange'#7#23'Genera'
+  +'lCheckBoxOnChange'#8'TabOrder'#2#2#0#0#9'TCheckBox'#18'TextItalicCheckBox'#4
+  +'Left'#2#6#6'Height'#2#22#3'Top'#2'y'#5'Width'#3'8'#1#5'Align'#7#8'alBottom'
+  +#20'BorderSpacing.Around'#2#6#7'Caption'#6#18'TextItalicCheckBox'#8'OnChange'
+  +#7#23'GeneralCheckBoxOnChange'#8'TabOrder'#2#3#0#0#9'TCheckBox'#21'TextUnder'
+  +'lineCheckBox'#4'Left'#2#6#6'Height'#2#22#3'Top'#3#149#0#5'Width'#3'8'#1#5'A'
+  +'lign'#7#8'alBottom'#20'BorderSpacing.Around'#2#6#7'Caption'#6#21'TextUnderl'
+  +'ineCheckBox'#8'OnChange'#7#23'GeneralCheckBoxOnChange'#8'TabOrder'#2#4#0#0#0
+  +#0#5'TPage'#13'CodetoolsPage'#7'Caption'#6#13'CodetoolsPage'#11'ClientWidth'
+  +#3'&'#2#12'ClientHeight'#3#207#1#0#9'TGroupBox'#25'AutomaticFeaturesGroupBox'
+  +#4'Left'#2#6#6'Height'#3#195#1#3'Top'#2#6#5'Width'#3#26#2#5'Align'#7#8'alCli'
+  +'ent'#20'BorderSpacing.Around'#2#6#7'Caption'#6#25'AutomaticFeaturesGroupBox'
+  +#12'ClientHeight'#3#173#1#11'ClientWidth'#3#18#2#8'TabOrder'#2#0#0#6'TLabel'
+  +#14'AutoDelayLabel'#4'Left'#2#6#6'Height'#2#20#3'Top'#3#188#0#5'Width'#3#6#2
+  +#5'Align'#7#5'alTop'#17'BorderSpacing.Top'#2#24#20'BorderSpacing.Around'#2#6
+  +#7'Caption'#6#14'AutoDelayLabel'#11'ParentColor'#8#0#0#6'TLabel'#17'AutoDela'
+  +'yMinLabel'#21'AnchorSideTop.Control'#7#17'AutoDelayTrackBar'#18'AnchorSideT'
+  +'op.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#20#3'Top'#3#160#0#5'Width'#2
+  +'{'#17'BorderSpacing.Top'#2#2#7'Caption'#6#17'AutoDelayMinLabel'#11'ParentCo'
+  +'lor'#8#0#0#6'TLabel'#17'AutoDelayMaxLabel'#21'AnchorSideTop.Control'#7#17'A'
+  +'utoDelayTrackBar'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#3#129#1#6'H'
+  +'eight'#2#20#3'Top'#3#160#0#5'Width'#2''#9'Alignment'#7#14'taRightJustify'#7
+  +'Anchors'#11#5'akTop'#7'akRight'#0#17'BorderSpacing.Top'#2#2#7'Caption'#6#17
+  +'AutoDelayMaxLabel'#11'ParentColor'#8#0#0#9'TCheckBox AutoIdentifierCompleti'
+  +'onCheckBox'#4'Left'#2#6#6'Height'#2#22#3'Top'#2#6#5'Width'#3#6#2#5'Align'#7
+  +#5'alTop'#20'BorderSpacing.Around'#2#6#7'Caption'#6' AutoIdentifierCompletio'
+  +'nCheckBox'#8'TabOrder'#2#0#0#0#9'TCheckBox'#26'AutoCodeParametersCheckBox'#4
+  +'Left'#2#6#6'Height'#2#22#3'Top'#2'>'#5'Width'#3#6#2#5'Align'#7#5'alTop'#20
+  +'BorderSpacing.Around'#2#6#7'Caption'#6#26'AutoCodeParametersCheckBox'#7'Ena'
+  +'bled'#8#8'TabOrder'#2#1#0#0#9'TCheckBox'#27'AutoToolTipExprEvalCheckBox'#4
+  +'Left'#2#6#6'Height'#2#22#3'Top'#2'Z'#5'Width'#3#6#2#5'Align'#7#5'alTop'#20
+  +'BorderSpacing.Around'#2#6#7'Caption'#6#27'AutoToolTipExprEvalCheckBox'#8'Ta'
+  +'bOrder'#2#2#0#0#9'TCheckBox'#28'AutoToolTipSymbToolsCheckBox'#4'Left'#2#6#6
+  +'Height'#2#22#3'Top'#2'"'#5'Width'#3#6#2#5'Align'#7#5'alTop'#20'BorderSpacin'
+  +'g.Around'#2#6#7'Caption'#6#28'AutoToolTipSymbToolsCheckBox'#8'TabOrder'#2#3
+  +#0#0#9'TTrackBar'#17'AutoDelayTrackBar'#4'Left'#2#6#6'Height'#2'('#3'Top'#2
+  +'v'#5'Width'#3#6#2#9'Frequency'#3#250#0#3'Max'#3#160#15#3'Min'#3#244#1#8'Pos'
+  +'ition'#3#244#1#8'ScalePos'#7#5'trTop'#5'Align'#7#5'alTop'#18'BorderSpacing.'
+  +'Left'#2#6#17'BorderSpacing.Top'#2#6#19'BorderSpacing.Right'#2#6#8'TabOrder'
+  +#2#4#0#0#0#0#5'TPage'#11'CodeFolding'#7'Caption'#6#11'CodeFolding'#11'Client'
+  +'Width'#3'&'#2#12'ClientHeight'#3#207#1#0#6'TLabel'#19'lblDividerDrawLevel'#4
+  +'Left'#2#6#6'Height'#2#20#3'Top'#2'G'#5'Width'#2'|'#7'Caption'#6#19'lblDivid'
+  +'erDrawLevel'#11'ParentColor'#8#0#0#6'TBevel'#6'Bevel1'#4'Left'#2#6#6'Height'
+  +#2#2#3'Top'#2'1'#5'Width'#3#25#2#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'
+  +#0#0#0#9'TCheckBox'#21'chkCodeFoldingEnabled'#4'Left'#2#6#6'Height'#2#22#3'T'
+  +'op'#2#23#5'Width'#3#175#0#7'Caption'#6#21'chkCodeFoldingEnabled'#8'OnChange'
+  +#7#27'chkCodeFoldingEnabledChange'#8'TabOrder'#2#0#0#0#9'TSpinEdit'#18'edDiv'
+  ,'iderDrawLevel'#4'Left'#3#211#0#6'Height'#2#23#3'Top'#2'B'#5'Width'#2'2'#8'M'
+  +'axValue'#2#10#8'MinValue'#2#1#8'TabOrder'#2#1#5'Value'#2#1#0#0#0#0#6'TPanel'
+  +#8'BtnPanel'#6'Height'#2')'#3'Top'#3#244#1#5'Width'#3'*'#2#5'Align'#7#8'alBo'
+  +'ttom'#8'AutoSize'#9#10'BevelOuter'#7#6'bvNone'#12'ClientHeight'#2')'#11'Cli'
+  +'entWidth'#3'*'#2#8'TabOrder'#2#1#0#7'TButton'#8'OkButton'#21'AnchorSideBott'
+  +'om.Side'#7#9'asrBottom'#4'Left'#3'V'#1#6'Height'#2#29#3'Top'#2#6#5'Width'#2
+  +'X'#5'Align'#7#7'alRight'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Capti'
+  +'on'#6#8'OkButton'#20'Constraints.MinWidth'#2'K'#7'OnClick'#7#13'OkButtonCli'
+  +'ck'#8'TabOrder'#2#0#0#0#7'TButton'#12'CancelButton'#20'AnchorSideRight.Side'
+  +#7#9'asrBottom'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3#180#1#6'H'
+  +'eight'#2#29#3'Top'#2#6#5'Width'#2'p'#5'Align'#7#7'alRight'#8'AutoSize'#9#20
+  +'BorderSpacing.Around'#2#6#7'Caption'#6#12'CancelButton'#20'Constraints.MinW'
+  +'idth'#2'K'#7'OnClick'#7#17'CancelButtonClick'#8'TabOrder'#2#1#0#0#0#10'TIma'
+  +'geList'#9'ImageList'#6'Height'#2#21#5'Width'#2#21#4'left'#3'X'#1#3'top'#3
+  +#192#0#6'Bitmap'#10#214#13#0#0'Li'#2#0#0#0#21#0#0#0#21#0#0#0#0#0#0#0#0#0#0#0
  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
@ -395,128 +408,131 @@ LazarusResources.Add('TEditorOptionsForm','FORMDATA',[
  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0'HNK'#255
-  +#139#145#141#255#168#174#170#255#194#199#195#255#209#214#210#255#161#164#161
-  +#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0'z'#133#128#255#176#186#181#255#141
-  +#147#144#255#153#156#154#255#147#148#147#255#188#192#188#255#229#234#230#255
-  +#174#178#176#255'KNN'#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#170#177#173#255#168#177#173#255#189#196
-  +#192#255#140#144#141#255#139#141#139#255#151#154#151#255#228#231#228#255#146
-  +#151#149#255'BIF'#255':@>'#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0'xzx'#255#231#233#231#255#208#210#209#255
-  +#172#176#173#255#180#184#182#255#185#189#186#255#207#211#207#255'|'#128'~'
-  +#255'MVR'#255'GOL'#255'6=;'#255'JPN'#255#149#155#151#255#165#172#168#255#203
-  +#207#203#255#193#197#192#255#167#170#167#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#187#188#187#255#240#242#240#255#239#240#238#255#227#229#227#255#202#205#202
-  +#255#189#192#189#255#147#152#148#255'kuq'#255'Yc`'#255'FNK'#255'x'#129'}'#255
-  +#176#185#181#255#148#152#149#255#168#170#169#255#211#213#211#255#204#208#204
-  +#255#230#234#230#255#158#164#160#255#0#0#0#0#0#0#0#0#0#0#0#0#218#220#218#255
-  +#187#190#188#255#162#166#163#255#180#187#182#255#179#184#180#255#167#170#167
-  +#255#140#145#141#255'frl'#255'[c_'#255#155#163#158#255#167#176#171#255#198
-  +#205#202#255#142#144#143#255#154#156#155#255#157#159#157#255#218#221#218#255
-  +#138#143#140#255'FMJ'#255#0#0#0#0#0#0#0#0#0#0#0#0'\a^'#255#149#158#153#255't'
-  +'yv'#255'kmk'#255#228#232#228#255#218#221#218#255#222#226#222#255#175#180#176
-  +#255'qvs'#255#234#237#234#255#208#211#209#255#165#171#168#255#167#172#168#255
-  +#211#217#212#255#216#221#217#255'ptq'#255'PXT'#255'HOL'#255#0#0#0#0#0#0#0#0
-  +#140#151#145#255#170#183#176#255#140#146#142#255#208#213#209#255'vyw'#255'|'
-  +'|'#255#185#188#185#255#189#191#189#255'GLK'#255'dge'#255#243#245#243#255#235
-  +#236#235#255#234#237#234#255#229#231#229#255#173#176#173#255#131#136#133#255
-  +'nxt'#255'[d`'#255'ISN'#255#0#0#0#0'z}z'#255#210#214#211#255#171#178#174#255
-  +#176#184#179#255#206#211#208#255#184#188#184#255#225#229#225#255#159#164#160
-  +#255'KQN'#255'IQM'#255'HOL'#255#228#230#228#255#231#232#231#255#226#229#226
-  +#255#222#227#222#255#221#226#221#255#164#171#166#255'pzu'#255'^hd'#255'LWR'
-  +#255#0#0#0#0#179#183#179#255#239#242#239#255#241#242#241#255#212#215#212#255
-  +#187#190#187#255#173#177#174#255#145#151#147#255'_hd'#255'Wa\'#255'FOK'#255
-  +'AKG'#255#186#189#187#255#228#231#228#255#222#226#222#255#220#225#220#255#220
-  +#225#220#255#163#171#166#255'ozu'#255'akf'#255'ENJ'#255#0#0#0#0#220#223#220
-  +#255#239#240#239#255#233#233#233#255#226#229#226#255#226#231#226#255#215#220
-  +#215#255#155#163#158#255'oyu'#255'[ea'#255'ITO'#255'AKF'#255#0#0#0#0#148#151
-  +#148#255#213#217#213#255#223#228#223#255#220#225#221#255#156#167#161#255'nyt'
-  +#255'LTP'#255#0#0#0#0#0#0#0#0#189#191#189#255#235#238#235#255#229#231#229#255
-  +#223#227#223#255#220#225#220#255#218#222#218#255#157#164#160#255'nxt'#255'^g'
-  +'c'#255'HRM'#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#141#144#141#255#173#176#173
-  +#255'y'#128'|'#255';A>'#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0'mom'#255#210#214
-  +#210#255#221#226#221#255#220#225#220#255#218#224#219#255#153#164#158#255'nzt'
-  +#255'[d_'#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#139#142#139#255#208
-  +#211#208#255#213#217#214#255#141#151#146#255'T^Z'#255#0#0#0#0#0#0#0#0#0#0#0#0
  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0'abb'#255#0#0#0#0#0#0#0#0#0#0#0#0
+  +#0#0#0#0#0#0#0#0#0#0'HNK'#255#139#145#141#255#168#174#170#255#194#199#195#255
+  +#209#214#210#255#161#164#161#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
+  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0'z'#133
+  +#128#255#176#186#181#255#141#147#144#255#153#156#154#255#147#148#147#255#188
+  +#192#188#255#229#234#230#255#174#178#176#255'KNN'#255#0#0#0#0#0#0#0#0#0#0#0#0
+  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#170#177#173
+  +#255#168#177#173#255#189#196#192#255#140#144#141#255#139#141#139#255#151#154
+  +#151#255#228#231#228#255#146#151#149#255'BIF'#255':@>'#255#0#0#0#0#0#0#0#0#0
+  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0'xzx'#255#231
+  +#233#231#255#208#210#209#255#172#176#173#255#180#184#182#255#185#189#186#255
+  +#207#211#207#255'|'#128'~'#255'MVR'#255'GOL'#255'6=;'#255'JPN'#255#149#155
+  +#151#255#165#172#168#255#203#207#203#255#193#197#192#255#167#170#167#255#0#0
+  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#187#188#187#255#240#242#240#255#239#240#238#255
+  +#227#229#227#255#202#205#202#255#189#192#189#255#147#152#148#255'kuq'#255'Yc'
+  +'`'#255'FNK'#255'x'#129'}'#255#176#185#181#255#148#152#149#255#168#170#169
+  +#255#211#213#211#255#204#208#204#255#230#234#230#255#158#164#160#255#0#0#0#0
+  +#0#0#0#0#0#0#0#0#218#220#218#255#187#190#188#255#162#166#163#255#180#187#182
+  +#255#179#184#180#255#167#170#167#255#140#145#141#255'frl'#255'[c_'#255#155
+  +#163#158#255#167#176#171#255#198#205#202#255#142#144#143#255#154#156#155#255
+  +#157#159#157#255#218#221#218#255#138#143#140#255'FMJ'#255#0#0#0#0#0#0#0#0#0#0
+  +#0#0'\a^'#255#149#158#153#255'tyv'#255'kmk'#255#228#232#228#255#218#221#218
+  +#255#222#226#222#255#175#180#176#255'qvs'#255#234#237#234#255#208#211#209#255
+  +#165#171#168#255#167#172#168#255#211#217#212#255#216#221#217#255'ptq'#255'PX'
+  +'T'#255'HOL'#255#0#0#0#0#0#0#0#0#140#151#145#255#170#183#176#255#140#146#142
+  +#255#208#213#209#255'vyw'#255'||'#255#185#188#185#255#189#191#189#255'GLK'
+  +#255'dge'#255#243#245#243#255#235#236#235#255#234#237#234#255#229#231#229#255
+  +#173#176#173#255#131#136#133#255'nxt'#255'[d`'#255'ISN'#255#0#0#0#0'z}z'#255
+  +#210#214#211#255#171#178#174#255#176#184#179#255#206#211#208#255#184#188#184
+  +#255#225#229#225#255#159#164#160#255'KQN'#255'IQM'#255'HOL'#255#228#230#228
+  +#255#231#232#231#255#226#229#226#255#222#227#222#255#221#226#221#255#164#171
+  +#166#255'pzu'#255'^hd'#255'LWR'#255#0#0#0#0#179#183#179#255#239#242#239#255
+  +#241#242#241#255#212#215#212#255#187#190#187#255#173#177#174#255#145#151#147
+  +#255'_hd'#255'Wa\'#255'FOK'#255'AKG'#255#186#189#187#255#228#231#228#255#222
+  +#226#222#255#220#225#220#255#220#225#220#255#163#171#166#255'ozu'#255'akf'
+  +#255'ENJ'#255#0#0#0#0#220#223#220#255#239#240#239#255#233#233#233#255#226#229
+  +#226#255#226#231#226#255#215#220#215#255#155#163#158#255'oyu'#255'[ea'#255'I'
+  +'TO'#255'AKF'#255#0#0#0#0#148#151#148#255#213#217#213#255#223#228#223#255#220
+  +#225#221#255#156#167#161#255'nyt'#255'LTP'#255#0#0#0#0#0#0#0#0#189#191#189
+  +#255#235#238#235#255#229#231#229#255#223#227#223#255#220#225#220#255#218#222
+  +#218#255#157#164#160#255'nxt'#255'^gc'#255'HRM'#255#0#0#0#0#0#0#0#0#0#0#0#0#0
+  ,#0#0#0#141#144#141#255#173#176#173#255'y'#128'|'#255';A>'#255#0#0#0#0#0#0#0#0
+  +#0#0#0#0#0#0#0#0'mom'#255#210#214#210#255#221#226#221#255#220#225#220#255#218
+  +#224#219#255#153#164#158#255'nzt'#255'[d_'#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
+  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
+  +#0#0#0#0#0#0#0#139#142#139#255#208#211#208#255#213#217#214#255#141#151#146
+  +#255'T^Z'#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
+  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
+  +#0#0'abb'#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  ,#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#192#192#192#255#204#204#204#255#202#202#202#255#202
-  +#202#202#255#201#201#201#255#200#200#200#255#199#199#199#255#198#198#198#255
-  +#197#197#197#255#193#193#193#255#186#186#186#255#184#184#184#255#180#180#180
-  +#255#173#173#173#255#160#160#160#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#160#160#160#255#246#246#246#255#246#246#246#255#238#238#238#255#230#230#230
-  +#255#230#230#230#255#230#230#230#255#231#231#231#255#232#232#232#255#230#230
-  +#230#255#229#229#229#255#228#228#228#255#226#226#226#255#222#222#222#255#204
-  +#204#204#255#184#184#184#255'yyy'#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#165#165
-  +#165#255#249#249#249#255#246#246#246#255#217#217#217#255#215#215#215#255#219
-  +#219#219#255#222#222#222#255#225#225#225#255#228#228#228#255#230#230#230#255
-  +#233#233#233#255#235#235#235#255#237#237#237#255#239#239#239#255#205#205#205
-  +#255#178#178#178#255'ttt'#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#164#164#164#255
-  +#247#247#247#255#245#245#245#255#216#216#216#255#218#218#218#255#222#222#222
-  +#255#225#225#225#255#228#228#228#255#230#230#230#255#233#233#233#255#235#235
-  +#235#255#237#237#237#255#239#239#239#255#241#241#241#255#203#203#203#255#168
-  +#168#168#255'ooo'#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#162#162#162#255#243#243
-  +#243#255#243#243#243#255#218#218#218#255#221#221#221#255#224#224#224#255#227
-  +#227#227#255#230#230#230#255#232#232#232#255#233#233#233#255#185#185#185#255
-  +#217#217#217#255#241#241#241#255#243#243#243#255#198#198#198#255#158#158#158
-  +#255'mmm'#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#161#161#161#255#239#239#239#255
-  +#241#241#241#255#222#222#222#255#224#224#224#255#227#227#227#255#229#229#229
-  +#255#232#232#232#255#234#234#234#255#225#225#225#255#141#141#141#255#233#233
-  +#233#255#242#242#242#255#244#244#244#255#198#198#198#255#157#157#157#255'kkk'
-  +#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#161#161#161#255#237#237#237#255#240#240
-  +#240#255#224#224#224#255#226#226#226#255#229#229#229#255#231#231#231#255#234
-  +#234#234#255#229#229#229#255#177#177#177#255#158#158#158#255#200#200#200#255
-  +#243#243#243#255#245#245#245#255#195#195#195#255#148#148#148#255'iii'#255#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#160#160#160#255#237#237#237#255#240#240#240#255
-  +#227#227#227#255#229#229#229#255#231#231#231#255#234#234#234#255#236#236#236
-  +#255#147#147#147#255#137#137#137#255#173#173#173#255'ccc'#255#217#217#217#255
-  +#246#246#246#255#191#191#191#255#139#139#139#255'eee'#255#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#160#160#160#255#236#236#236#255#240#240#240#255#229#229#229#255
-  +#230#230#230#255#233#233#233#255#235#235#235#255#238#238#238#255#221#221#221
-  +#255#219#219#219#255#196#196#196#255'aaa'#255#209#209#209#255#247#247#247#255
-  +#188#188#188#255#132#132#132#255'```'#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#160
-  +#160#160#255#235#235#235#255#240#240#240#255#231#231#231#255#233#233#233#255
-  +#235#235#235#255#237#237#237#255#240#240#240#255#151#151#151#255'nnn'#255#150
-  +#150#150#255'bbb'#255#210#210#210#255#248#248#248#255#186#186#186#255''
-  +#255']]]'#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#159#159#159#255#232#232#232#255
-  +#239#239#239#255#233#233#233#255#235#235#235#255#237#237#237#255#239#239#239
-  +#255#241#241#241#255'UUU'#255#221#221#221#255#216#216#216#255']]]'#255#209
-  +#209#209#255#249#249#249#255#184#184#184#255'{{{'#255'\\\'#255#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#158#158#158#255#229#229#229#255#236#236#236#255#235#235
-  +#235#255#237#237#237#255#239#239#239#255#241#241#241#255#242#242#242#255#165
-  +#165#165#255'|||'#255#142#142#142#255#144#144#144#255#202#202#202#255#250#250
-  +#250#255#182#182#182#255'xxx'#255'ZZZ'#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#156#156#156#255#223#223#223#255#232#232#232#255#238#238#238#255#239#239#239
-  +#255#240#240#240#255#242#242#242#255#244#244#244#255#245#245#245#255#236#236
-  +#236#255#245#245#245#255#249#249#249#255#250#250#250#255#251#251#251#255#174
-  +#174#174#255'sss'#255'VVV'#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#154#154#154
-  +#255#213#213#213#255#226#226#226#255#219#219#219#255#199#199#199#255#187#187
-  +#187#255#185#185#185#255#185#185#185#255#183#183#183#255#180#180#180#255#178
-  +#178#178#255#177#177#177#255#177#177#177#255#170#170#170#255'{{{'#255'kkk'
-  +#255'TTT'#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#149#149#149#255#205#205#205#255
-  +#192#192#192#255'www'#255'HHH'#255'EEE'#255'GGG'#255'KKK'#255'OOO'#255'PPP'
-  +#255'LLL'#255'GGG'#255'HHH'#255'NNN'#255'VVV'#255'lll'#255'QQQ'#255#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#129#129#129#255#156#156#156#255'\\\'#255'>>>'#255'BBB'
-  +#255'@@@'#255'BBB'#255'CCC'#255'FFF'#255'HHH'#255'EEE'#255'CCC'#255'CCC'#255
-  +'EEE'#255'III'#255'UUU'#255'LLL'#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0')))'#255'###'#255'###'#255'"""'#255'"""'#255'"""'#255'"""'#255'"""'
-  ,#255'"""'#255'"""'#255'"""'#255'"""'#255'"""'#255'$$$'#255#0#0#0#0#0#0#0#0#0
+  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#192#192#192#255
+  +#204#204#204#255#202#202#202#255#202#202#202#255#201#201#201#255#200#200#200
+  +#255#199#199#199#255#198#198#198#255#197#197#197#255#193#193#193#255#186#186
+  +#186#255#184#184#184#255#180#180#180#255#173#173#173#255#160#160#160#255#0#0
+  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#160#160#160#255#246#246#246#255#246#246
+  +#246#255#238#238#238#255#230#230#230#255#230#230#230#255#230#230#230#255#231
+  +#231#231#255#232#232#232#255#230#230#230#255#229#229#229#255#228#228#228#255
+  +#226#226#226#255#222#222#222#255#204#204#204#255#184#184#184#255'yyy'#255#0#0
+  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#165#165#165#255#249#249#249#255#246#246#246#255
+  +#217#217#217#255#215#215#215#255#219#219#219#255#222#222#222#255#225#225#225
+  +#255#228#228#228#255#230#230#230#255#233#233#233#255#235#235#235#255#237#237
+  +#237#255#239#239#239#255#205#205#205#255#178#178#178#255'ttt'#255#0#0#0#0#0#0
+  +#0#0#0#0#0#0#0#0#0#0#164#164#164#255#247#247#247#255#245#245#245#255#216#216
+  +#216#255#218#218#218#255#222#222#222#255#225#225#225#255#228#228#228#255#230
+  +#230#230#255#233#233#233#255#235#235#235#255#237#237#237#255#239#239#239#255
+  +#241#241#241#255#203#203#203#255#168#168#168#255'ooo'#255#0#0#0#0#0#0#0#0#0#0
+  +#0#0#0#0#0#0#162#162#162#255#243#243#243#255#243#243#243#255#218#218#218#255
+  +#221#221#221#255#224#224#224#255#227#227#227#255#230#230#230#255#232#232#232
+  +#255#233#233#233#255#185#185#185#255#217#217#217#255#241#241#241#255#243#243
+  +#243#255#198#198#198#255#158#158#158#255'mmm'#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0
+  +#0#0#161#161#161#255#239#239#239#255#241#241#241#255#222#222#222#255#224#224
+  +#224#255#227#227#227#255#229#229#229#255#232#232#232#255#234#234#234#255#225
+  +#225#225#255#141#141#141#255#233#233#233#255#242#242#242#255#244#244#244#255
+  +#198#198#198#255#157#157#157#255'kkk'#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#161
+  +#161#161#255#237#237#237#255#240#240#240#255#224#224#224#255#226#226#226#255
+  +#229#229#229#255#231#231#231#255#234#234#234#255#229#229#229#255#177#177#177
+  +#255#158#158#158#255#200#200#200#255#243#243#243#255#245#245#245#255#195#195
+  +#195#255#148#148#148#255'iii'#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#160#160#160
+  +#255#237#237#237#255#240#240#240#255#227#227#227#255#229#229#229#255#231#231
+  +#231#255#234#234#234#255#236#236#236#255#147#147#147#255#137#137#137#255#173
+  +#173#173#255'ccc'#255#217#217#217#255#246#246#246#255#191#191#191#255#139#139
+  +#139#255'eee'#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#160#160#160#255#236#236#236
+  +#255#240#240#240#255#229#229#229#255#230#230#230#255#233#233#233#255#235#235
+  +#235#255#238#238#238#255#221#221#221#255#219#219#219#255#196#196#196#255'aaa'
+  +#255#209#209#209#255#247#247#247#255#188#188#188#255#132#132#132#255'```'#255
+  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#160#160#160#255#235#235#235#255#240#240#240
+  +#255#231#231#231#255#233#233#233#255#235#235#235#255#237#237#237#255#240#240
+  +#240#255#151#151#151#255'nnn'#255#150#150#150#255'bbb'#255#210#210#210#255
+  +#248#248#248#255#186#186#186#255''#255']]]'#255#0#0#0#0#0#0#0#0#0#0#0#0#0
+  +#0#0#0#159#159#159#255#232#232#232#255#239#239#239#255#233#233#233#255#235
+  +#235#235#255#237#237#237#255#239#239#239#255#241#241#241#255'UUU'#255#221#221
+  +#221#255#216#216#216#255']]]'#255#209#209#209#255#249#249#249#255#184#184#184
+  +#255'{{{'#255'\\\'#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#158#158#158#255#229
+  +#229#229#255#236#236#236#255#235#235#235#255#237#237#237#255#239#239#239#255
+  +#241#241#241#255#242#242#242#255#165#165#165#255'|||'#255#142#142#142#255#144
+  +#144#144#255#202#202#202#255#250#250#250#255#182#182#182#255'xxx'#255'ZZZ'
+  +#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#156#156#156#255#223#223#223#255#232#232
+  ,#232#255#238#238#238#255#239#239#239#255#240#240#240#255#242#242#242#255#244
+  +#244#244#255#245#245#245#255#236#236#236#255#245#245#245#255#249#249#249#255
+  +#250#250#250#255#251#251#251#255#174#174#174#255'sss'#255'VVV'#255#0#0#0#0#0
+  +#0#0#0#0#0#0#0#0#0#0#0#154#154#154#255#213#213#213#255#226#226#226#255#219
+  +#219#219#255#199#199#199#255#187#187#187#255#185#185#185#255#185#185#185#255
+  +#183#183#183#255#180#180#180#255#178#178#178#255#177#177#177#255#177#177#177
+  +#255#170#170#170#255'{{{'#255'kkk'#255'TTT'#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
+  +#0#149#149#149#255#205#205#205#255#192#192#192#255'www'#255'HHH'#255'EEE'#255
+  +'GGG'#255'KKK'#255'OOO'#255'PPP'#255'LLL'#255'GGG'#255'HHH'#255'NNN'#255'VVV'
+  +#255'lll'#255'QQQ'#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#129#129#129#255#156
+  +#156#156#255'\\\'#255'>>>'#255'BBB'#255'@@@'#255'BBB'#255'CCC'#255'FFF'#255
+  +'HHH'#255'EEE'#255'CCC'#255'CCC'#255'EEE'#255'III'#255'UUU'#255'LLL'#255#0#0
+  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0')))'#255'###'#255'###'#255'"""'
+  +#255'"""'#255'"""'#255'"""'#255'"""'#255'"""'#255'"""'#255'"""'#255'"""'#255
+  +'"""'#255'$$$'#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
+  +#0#0
 ]);
+
+
--- a/ide/editoroptions.pp
+++ b/ide/editoroptions.pp
@ -508,6 +508,8 @@ type
  { TEditorOptionsForm }

  TEditorOptionsForm = class(TForm)
+    KeyMappingFindKeyButton: TButton;
+    KeyMappingFilterEdit: TEdit;
    ForeGroundLabel: TLabel;
    BackGroundLabel: TLabel;
    EditorOptionsGroupBox: TCheckGroup;
@ -619,10 +621,12 @@ type
    procedure RightMarginColorButtonColorChanged(Sender: TObject);

    // key mapping
+    procedure KeyMappingFilterEditChange(Sender: TObject);
    procedure KeyMappingChooseSchemeButtonClick(Sender: TObject);
    procedure KeyMappingTreeViewMouseUp(Sender: TObject;
                      Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
    procedure KeyMappingConsistencyCheckButtonClick(Sender: TObject);
+    procedure KeyMappingFindKeyButtonClick(Sender: TObject);

    // color
    procedure ColorElementListBoxSelectionChange(Sender: TObject; User: Boolean);
@ -667,6 +671,8 @@ type
    procedure SetupDisplayPage(Page: Integer);

    // keymapping
+    KeyMapNameFilter: string;
+    KeyMapKeyFilter: TIDEShortCut;
    procedure SetupKeyMappingsPage(Page: Integer);
    function KeyMappingRelationToString(Index: Integer): String;
    function KeyMappingRelationToString(KeyRelation:
@ -1452,7 +1458,8 @@ begin
  fTabWidth := 8;

  // Display options
-  fEditorFont := 'courier';
+  fEditorFont := SynDefaultFontName;
+  fEditorFontHeight := SynDefaultFontHeight;

  // Key Mappings
  fKeyMappingScheme := 'default';
@ -1573,7 +1580,7 @@ begin
      XMLConfig.GetValue('EditorOptions/Display/VisibleRightMarginColor'
      , clBtnFace);
    fEditorFont  :=
-      XMLConfig.GetValue('EditorOptions/Display/EditorFont', 'courier');
+      XMLConfig.GetValue('EditorOptions/Display/EditorFont', SynDefaultFontName);
    fEditorFontHeight :=
      XMLConfig.GetValue('EditorOptions/Display/EditorFontHeight', 12);
    RepairEditorFontHeight(fEditorFontHeight);
@ -1705,9 +1712,9 @@ begin
    XMLConfig.SetDeleteValue('EditorOptions/Display/RightMarginColor',
      fRightMarginColor, clBtnFace);
    XMLConfig.SetDeleteValue('EditorOptions/Display/EditorFont',
-      fEditorFont, 'courier');
+      fEditorFont, SynDefaultFontName);
    XMLConfig.SetDeleteValue('EditorOptions/Display/EditorFontHeight'
-      ,fEditorFontHeight, 12);
+      ,fEditorFontHeight, SynDefaultFontHeight);
    XMLConfig.SetDeleteValue('EditorOptions/Display/ExtraCharSpacing'
      ,fExtraCharSpacing, 1);
    XMLConfig.SetDeleteValue('EditorOptions/Display/ExtraLineSpacing'
@ -2206,6 +2213,8 @@ begin
  ASynEdit.RightEdgeColor := fRightMarginColor;
  ASynEdit.Font.Height := fEditorFontHeight;// set height before name for XLFD !
  ASynEdit.Font.Name := fEditorFont;
+  //debugln(['TEditorOptions.GetSynEditSettings ',ASynEdit.font.height]);
+  
  ASynEdit.ExtraCharSpacing := fExtraCharSpacing;
  ASynEdit.ExtraLineSpacing := fExtraLineSpacing;
  ASynEdit.MaxUndo := fUndoLimit;
@ -2220,7 +2229,7 @@ begin
 end;

 procedure TEditorOptions.SetSynEditSettings(ASynEdit: TSynEdit);
-// write synedit settings to file
+// copy settings from a synedit to the options
 begin
  // general options
  fSynEditOptions := ASynEdit.Options;
@ -2297,6 +2306,7 @@ begin
  ASynEdit.RightEdgeColor := fRightMarginColor;
  ASynEdit.Font.Height := fEditorFontHeight; // set height before Name for XLFD !
  ASynEdit.Font.Name := fEditorFont;
+  //debugln(['TEditorOptions.GetSynEditPreviewSettings ',DbgSName(ASynEdit),' ',ASynEdit.font.Height,' ',ASynEdit.font.name]);
  ASynEdit.ExtraCharSpacing := fExtraCharSpacing;
  ASynEdit.ExtraLineSpacing := fExtraLineSpacing;
  ASynEdit.ReadOnly := True;
@ -2315,11 +2325,11 @@ begin
  inherited Create(TheOwner);
  FormCreating := True;
  Caption      := lismenueditoroptions;
+  KeyMapNameFilter:='';
+  KeyMapKeyFilter:=CleanIDEShortCut;

  IDEDialogLayoutList.ApplyLayout(Self, 480, 480);

-  MainNoteBook.PageIndex := 0;
-
  SetupGeneralPage(0);
  SetupDisplayPage(1);
  SetupKeyMappingsPage(2);
@ -2351,7 +2361,7 @@ begin
      begin
        if EditorOpts.UseSyntaxHighlight then
          Highlighter := PreviewSyn;
-        EditorOpts.GetSynEditSettings(PreviewEdits[a]);
+        EditorOpts.GetSynEditPreviewSettings(PreviewEdits[a]);
        EditingKeyMap.AssignTo(PreviewEdits[a].KeyStrokes,
          TSourceEditorWindowInterface);
        if a <> 3 then
@ -2634,6 +2644,7 @@ begin
    begin
      if (FontDialogName[p] = '-') then
      begin
+        // this is an XLFD font name, the third item is the name
        s := copy(FontDialogName, p2 + 1, p - p2 - 1);
        p2 := p;
        case Index of
@ -2686,6 +2697,27 @@ begin
  end;
 end;

+procedure TEditorOptionsForm.KeyMappingFilterEditChange(Sender: TObject);
+var
+  Filter: String;
+begin
+  if [csLoading,csDestroying]*ComponentState<>[] then exit;
+  Filter:=KeyMappingFilterEdit.Text;
+  if (Filter=lisFilter2) or (Filter=KeyMappingFilterEdit.Name) then Filter:='';
+  KeyMapNameFilter:=Filter;
+  FillKeyMappingTreeView;
+end;
+
+procedure TEditorOptionsForm.KeyMappingFindKeyButtonClick(Sender: TObject);
+var
+  KeyFilter: TIDEShortCut;
+begin
+  if ShowKeyMappingGrabForm(EditingKeyMap,KeyFilter)<>mrOK then exit;
+  //debugln(['TEditorOptionsForm.KeyMappingFindKeyButtonClick ',KeyAndShiftStateToEditorKeyString(KeyFilter)]);
+  KeyMapKeyFilter:=KeyFilter;
+  FillKeyMappingTreeView;
+end;
+
 procedure TEditorOptionsForm.KeyMappingChooseSchemeButtonClick(
  Sender: TObject);
 var
@ -3351,16 +3383,24 @@ var
  NewCategoryNode, NewKeyNode: TTreeNode;
  CurCategory: TIDECommandCategory;
  CurKeyRelation: TKeyCommandRelation;
+  ChildNodeIndex: Integer;
+  CategoryNodeIndex: Integer;
+  HasFilter: Boolean;
+  ItemCaption: String;
+  NameFilterUp: String;
 begin
+  HasFilter:=(KeyMapNameFilter<>'');
+  NameFilterUp:=uppercase(KeyMapNameFilter);
  with KeyMappingTreeView do
  begin
    BeginUpdate;
+    CategoryNodeIndex:=0;
    for i := 0 to EditingKeyMap.CategoryCount - 1 do
    begin
      CurCategory := EditingKeyMap.Categories[i];
-      if Items.TopLvlCount > i then
+      if Items.TopLvlCount > CategoryNodeIndex then
      begin
-        NewCategoryNode := Items.TopLvlItems[i];
+        NewCategoryNode := Items.TopLvlItems[CategoryNodeIndex];
        NewCategoryNode.Text := CurCategory.Description;
        NewCategoryNode.Data := CurCategory;
      end
@ -3368,25 +3408,42 @@ begin
        NewCategoryNode := Items.AddObject(Nil, CurCategory.Description, CurCategory);
      NewCategoryNode.ImageIndex := 0;
      NewCategoryNode.SelectedIndex := NewCategoryNode.ImageIndex;
+      ChildNodeIndex:=0;
      for j := 0 to CurCategory.Count - 1 do
      begin
        CurKeyRelation := TKeyCommandRelation(CurCategory[j]);
-        if NewCategoryNode.Count > j then
+        ItemCaption:=KeyMappingRelationToString(CurKeyRelation);
+        if (NameFilterUp<>'')
+        and (System.Pos(NameFilterUp,UpperCase(ItemCaption))=0) then
+          continue;
+        if (KeyMapKeyFilter.Key1<>VK_UNKNOWN)
+        and (CompareIDEShortCutKey1s(@KeyMapKeyFilter,@CurKeyRelation.ShortcutA)<>0)
+        and (CompareIDEShortCutKey1s(@KeyMapKeyFilter,@CurKeyRelation.ShortcutB)<>0)
+        then
+          continue;
+        if NewCategoryNode.Count > ChildNodeIndex then
        begin
-          NewKeyNode := NewCategoryNode.Items[j];
-          NewKeyNode.Text := KeyMappingRelationToString(CurKeyRelation);
+          NewKeyNode := NewCategoryNode.Items[ChildNodeIndex];
+          NewKeyNode.Text := ItemCaption;
          NewKeyNode.Data := CurKeyRelation;
        end
        else
          NewKeyNode := Items.AddChildObject(NewCategoryNode,
-            KeyMappingRelationToString(CurKeyRelation), CurKeyRelation);
+            ItemCaption, CurKeyRelation);
        NewKeyNode.ImageIndex := 1;
        NewKeyNode.SelectedIndex := NewKeyNode.ImageIndex;
+        inc(ChildNodeIndex);
      end;
-      while NewCategoryNode.Count > CurCategory.Count do
+      // delete unneeded ones
+      while NewCategoryNode.Count > ChildNodeIndex do
        NewCategoryNode[NewCategoryNode.Count - 1].Delete;
+      if NewCategoryNode.Count>0 then begin
+        if HasFilter then
+          NewCategoryNode.Expanded:=true;
+        inc(CategoryNodeIndex);
+      end;
    end;
-    while Items.TopLvlCount > EditingKeyMap.CategoryCount do
+    while Items.TopLvlCount > CategoryNodeIndex do
      Items.TopLvlItems[Items.TopLvlCount - 1].Delete;
    EndUpdate;
  end;
@ -3590,6 +3647,8 @@ begin
  KeyMappingConsistencyCheckButton.Caption := dlgCheckConsistency;

  KeyMappingHelpLabel.Caption := dlgEdHintCommand;
+  KeyMappingFilterEdit.Text:=lisFilter2;
+  KeyMappingFindKeyButton.Caption:=lisFindKeyCombination;
 end;

 procedure TEditorOptionsForm.SetupColorPage(Page: Integer);
--- a/ide/keymapping.pp
+++ b/ide/keymapping.pp
@ -136,9 +136,14 @@ type
    property Relations[Index:integer]:TKeyCommandRelation read GetRelation; default;
    property RelationCount:integer read GetRelationCount;
  end;
+  
+  TKMEditFormMode = (
+    kmefmEdit,
+    kmefmGrab
+    );

-  //---------------------------------------------------------------------------
-  // form for editing one command - key relationship
+  { TKeyMappingEditForm - form for editing one command - key relationship }
+  
  TKeyMappingEditForm = class(TForm)
  public
    OkButton: TButton;
@ -156,6 +161,7 @@ type
  protected
    procedure KeyDown(var Key: Word; Shift: TShiftState); override;
  private
+    FMode: TKMEditFormMode;
    GrabbingKey: integer; { 0=none,
                            1=Default key (1st in sequence),
                            2=Default key (second in sequence),
@ -165,10 +171,16 @@ type
    procedure DeactivateGrabbing;
    procedure SetComboBox(AComboBox: TComboBox; const AValue: string);
    function ResolveConflicts(Key: TIDEShortCut; Scope: TIDECommandScope): boolean;
+    procedure SetMode(const AValue: TKMEditFormMode);
+    procedure SetupFindView;
+    procedure CheckEditModeInput;
+    procedure CheckGrabModeInput;
  public
    constructor Create(TheOwner: TComponent); override;
    KeyCommandRelationList: TKeyCommandRelationList;
-    KeyIndex:integer;
+    KeyIndex: integer;
+    NewKeyA, NewKeyB: TIDEShortCut;
+    property Mode: TKMEditFormMode read FMode write SetMode;
  end;

 function KeyAndShiftStateToEditorKeyString(
@ -176,6 +188,8 @@ function KeyAndShiftStateToEditorKeyString(
 function KeyAndShiftStateToEditorKeyString(const Key: TIDEShortCut): String;
 function ShowKeyMappingEditForm(Index: integer;
                AKeyCommandRelationList: TKeyCommandRelationList): TModalResult;
+function ShowKeyMappingGrabForm(AKeyCommandRelationList: TKeyCommandRelationList;
+                out Key: TIDEShortCut): TModalResult;
 function FindKeymapConflicts(Keymap: TKeyCommandRelationList;
                      Protocol: TStrings; out Index1, Index2: integer): integer;
 function EditorCommandToDescriptionString(cmd: word): String;
@ -1547,6 +1561,26 @@ begin
  end;
 end;

+function ShowKeyMappingGrabForm(
+  AKeyCommandRelationList: TKeyCommandRelationList; out Key: TIDEShortCut
+  ): TModalResult;
+begin
+  Result:=mrCancel;
+  if KeyMappingEditForm<>nil then exit;
+  KeyMappingEditForm:=TKeyMappingEditForm.Create(nil);
+  with KeyMappingEditForm do begin
+    try
+      KeyCommandRelationList:=AKeyCommandRelationList;
+      KeyIndex:=-1;
+      Mode:=kmefmGrab;
+      Result:=ShowModal;
+      Key:=NewKeyA;
+    finally
+      FreeThenNil(KeyMappingEditForm);
+    end;
+  end;
+end;
+
 function FindKeymapConflicts(Keymap: TKeyCommandRelationList;
   Protocol: TStrings; out Index1,Index2:integer):integer;
 // 0 = ok, no errors
@ -1746,6 +1780,8 @@ var
  s: string;
 begin
  inherited Create(TheOwner);
+  NewKeyA:=CleanIDEShortCut;
+  NewKeyB:=CleanIDEShortCut;
  if LazarusResources.Find(ClassName)=nil then
  begin
    SetBounds((Screen.Width-432) div 2, (Screen.Height-310) div 2, 432, 340);
@ -1878,9 +1914,14 @@ begin
  GrabbingKey := 0;
 end;

-procedure TKeyMappingEditForm.OkButtonClick(Sender:TObject);
+procedure TKeyMappingEditForm.SetupFindView;
+begin
+  KeyGroupBox[1].Visible:=false;
+  CommandLabel.Caption:='Choose a key to find';
+end;
+
+procedure TKeyMappingEditForm.CheckEditModeInput;
 var
-  NewKeyA, NewKeyB: TIDEShortCut;
  CurRelation: TKeyCommandRelation;
 begin
  // set defaults
@ -1970,6 +2011,52 @@ begin
  ModalResult:=mrOk;
 end;

+procedure TKeyMappingEditForm.CheckGrabModeInput;
+begin
+  // set defaults
+  NewKeyA:=CleanIDEShortCut;
+
+  //debugln('TKeyMappingEditForm.OkButtonClick A ShortcutA=',KeyAndShiftStateToEditorKeyString(NewKeyA),' ShortcutB=',KeyAndShiftStateToEditorKeyString(NewKeyB));
+
+  // get settings for key1
+  NewKeyA.Key1:=EditorKeyStringToVKCode(KeyComboBox[0].Text);
+  if NewKeyA.Key1<>VK_UNKNOWN then
+  begin
+    if KeyCtrlCheckBox[0].Checked then include(NewKeyA.Shift1,ssCtrl);
+    if KeyAltCheckBox[0].Checked then include(NewKeyA.Shift1,ssAlt);
+    if KeyShiftCheckBox[0].Checked then include(NewKeyA.Shift1,ssShift);
+
+    NewKeyA.Key2:=EditorKeyStringToVKCode(KeyComboBox[1].Text);
+    if NewKeyA.Key2<>VK_UNKNOWN then
+    begin
+      if KeyCtrlCheckBox[1].Checked then include(NewKeyA.Shift2,ssCtrl);
+      if KeyAltCheckBox[1].Checked then include(NewKeyA.Shift2,ssAlt);
+      if KeyShiftCheckBox[1].Checked then include(NewKeyA.Shift2,ssShift);
+    end;
+  end;
+
+  if NewKeyA.Key1=VK_UNKNOWN then
+  begin
+    NewKeyA:=NewKeyB;
+    NewKeyB.Key1:=VK_UNKNOWN;
+    NewKeyB.Shift1:=[];
+    NewKeyB.Key2:=VK_UNKNOWN;
+    NewKeyB.Shift2:=[];
+  end;
+
+  //debugln('TKeyMappingEditForm.OkButtonClick D ShortcutA=',KeyAndShiftStateToEditorKeyString(NewKeyA),' ShortcutB=',KeyAndShiftStateToEditorKeyString(NewKeyB));
+
+  ModalResult:=mrOk;
+end;
+
+procedure TKeyMappingEditForm.OkButtonClick(Sender:TObject);
+begin
+  if Mode=kmefmGrab then
+    CheckGrabModeInput
+  else
+    CheckEditModeInput;
+end;
+
 procedure TKeyMappingEditForm.CancelButtonClick(Sender:TObject);
 begin
  ModalResult:=mrCancel;
@ -2079,6 +2166,13 @@ begin
  Result:=true;
 end;

+procedure TKeyMappingEditForm.SetMode(const AValue: TKMEditFormMode);
+begin
+  if FMode=AValue then exit;
+  FMode:=AValue;
+  if FMode=kmefmGrab then SetupFindView;
+end;
+
 procedure TKeyMappingEditForm.ActivateGrabbing(AGrabbingKey: integer);
 var i: integer;
 begin
@ -2222,7 +2316,6 @@ begin
    );
  AddDefault(C, 'Uncomment selection', lisMenuUncommentSelection,
    ecSelectionUncomment);
-  AddDefault(C, 'Insert $IFDEF', lisKMInsertIFDEF, ecSelectionConditional);
  AddDefault(C, 'Sort selection', lisSortSelSortSelection, ecSelectionSort);
  AddDefault(C, 'Break Lines in selection', lisMenuBeakLinesInSelection,
    ecSelectionBreakLines);
@ -2257,6 +2350,7 @@ begin
  AddDefault(C, 'Delete whole text', srkmecClearAll, ecClearAll);
  AddDefault(C, 'Break line and move cursor', srkmecLineBreak, ecLineBreak);
  AddDefault(C, 'Break line, leave cursor', srkmecInsertLine, ecInsertLine);
+  AddDefault(C, 'Insert $IFDEF', lisKMInsertIFDEF, ecSelectionConditional);
  AddDefault(C, 'Insert from Character Map', lisMenuInsertCharacter,
    ecInsertCharacter);
  AddDefault(C, 'Insert GPL notice', srkmecInsertGPLNotice, ecInsertGPLNotice);
--- a/ide/lazarus_dci.lrs
+++ b/ide/lazarus_dci.lrs
@ -27,5 +27,7 @@ LazarusResources.Add('lazarus_dci_file','DCI',[
  +'be | begin end else begin end]'#10'begin'#10'  |'#10'end else begin'#10#10
  +'end;'#10'[withc | with for components]'#10'with | do begin'#10'  Name:='''''
  +';'#10'  Parent:=;'#10'  Left:=;'#10'  Top:=;'#10'  Width:=;'#10'  Height:=;'
-  +#10'  Caption:='''';'#10'end;'#10
+  +#10'  Caption:='''';'#10'end;'#10'[d | debugln]'#10'$(AttributesStart)'#10'E'
+  +'nableMakros=true'#10'$(AttributesEnd)'#10'debugln([''$ProcedureName() ''|])'
+  +';'#10
 ]);
--- a/ide/lazarus_dci_file.dci
+++ b/ide/lazarus_dci_file.dci
@ -124,3 +124,8 @@ with | do begin
  Height:=;
  Caption:='';
 end;
+[d | debugln]
+$(AttributesStart)
+EnableMakros=true
+$(AttributesEnd)
+debugln(['$ProcedureName() '|]);
--- a/ide/lazarusidestrconsts.pas
+++ b/ide/lazarusidestrconsts.pas
@ -1692,7 +1692,7 @@ resourcestring
  srkmConflicW = ' conflicts with ';
  srkmCommand1 = '    command1 "';
  srkmCommand2 = '    command2 "';
-  srkmEditForCmd='Edit keys for command';
+  srkmEditForCmd='Edit keys of command';
  srkmKey      = 'Key (or 2 keys combination)';
  srkmGrabKey  = 'Grab key';
  srkmGrabSecondKey  = 'Grab second key';
@ -3800,6 +3800,8 @@ resourcestring
    +'dependency is not allowed.';
  lisTheComponentCanNotBeDeletedBecauseItIsNotOwnedBy = 'The component %s can '
    +'not be deleted, because it is not owned by %s.';
+  lisFilter2 = '(filter)';
+  lisFindKeyCombination = 'Find key combination';
  
 implementation