From 62bfbe7c8ca19d17a9fc8a109d4c9fadc6c5837f Mon Sep 17 00:00:00 2001
From: mattias <nc-gaertnma@netcologne.de>
Date: Mon, 26 Oct 2009 13:17:35 +0000
Subject: [PATCH] IDE: codetools options: added indentation example file name

git-svn-id: trunk@22289 -
---
 ide/codetoolsoptions.pas                 |  52 +++
 ide/editoroptions.pp                     |  32 --
 ide/frames/codetools_general_options.lfm |  92 ++++-
 ide/frames/codetools_general_options.lrs |  64 ++--
 ide/frames/codetools_general_options.pas |  31 +-
 ide/frames/editor_general_options.lfm    | 235 ++++++------
 ide/frames/editor_general_options.lrs    | 434 +++++++++++------------
 ide/lazarusidestrconsts.pas              |   4 +
 8 files changed, 535 insertions(+), 409 deletions(-)

diff --git a/ide/codetoolsoptions.pas b/ide/codetoolsoptions.pas
index 7d60ea49a9..043a27c39c 100644
--- a/ide/codetoolsoptions.pas
+++ b/ide/codetoolsoptions.pas
@@ -40,6 +40,9 @@ uses
   Dialogs, CodeToolManager, DefineTemplates, SourceChanger, SynEdit, IDEOptionsIntf, IDEContextHelpEdit,
   IDEOptionDefs, EditDefineTree, LazarusIDEStrConsts, IDEProcs;
 
+const
+  DefaultIndentationFilename = 'laz_indentation.pas'; // in directory GetPrimaryConfigPath
+
 type
 
   { TCodeToolsOptions }
@@ -89,6 +92,9 @@ type
     FIdentComplAddAssignOperator: Boolean;
     FIdentComplAutoStartAfterPoint: boolean;
 
+    // auto indentation
+    fIndentationFilename: String;
+
     procedure SetFilename(const AValue: string);
   public
     class function GetGroupCaption:string; override;
@@ -107,6 +113,7 @@ type
     function IsEqual(CodeToolsOpts: TCodeToolsOptions): boolean;
     function CreateCopy: TCodeToolsOptions;
     procedure ReadGlobalDefinesTemplatesFromTree(Tree: TDefineTree);
+    procedure CreateDefaultIndentationFile;
     
     // General
     property SrcPath: string read FSrcPath write FSrcPath;
@@ -176,6 +183,10 @@ type
                                              write FIdentComplAddAssignOperator;
     property IdentComplAutoStartAfterPoint: boolean read FIdentComplAutoStartAfterPoint
                                            write FIdentComplAutoStartAfterPoint;
+
+    // indentation
+    property IndentationFileName: String
+      read fIndentationFileName write fIndentationFileName;
   end;
 
 var
@@ -309,6 +320,7 @@ var
   end;
   
 begin
+  CreateDefaultIndentationFile;
   try
     XMLConfig:=TXMLConfig.Create(FFileName);
     FileVersion:=XMLConfig.GetValue('CodeToolsOptions/Version/Value',0);
@@ -394,6 +406,11 @@ begin
     FIdentComplAutoStartAfterPoint:=XMLConfig.GetValue(
       'CodeToolsOptions/IdentifierCompletion/AutoStartAfterPoint',true);
 
+    // indentation
+    fIndentationFilename :=
+      XMLConfig.GetValue('CodeToolsOptions/Indentation/FileName'
+      , TrimFilename(GetPrimaryConfigPath + PathDelim +DefaultIndentationFilename));
+
     XMLConfig.Free;
   except
     on E: Exception do begin
@@ -500,6 +517,10 @@ begin
     XMLConfig.SetDeleteValue('CodeToolsOptions/IdentifierCompletion/AutoStartAfterPoint',
       FIdentComplAutoStartAfterPoint,true);
 
+    // indentation
+    XMLConfig.SetDeleteValue('CodeToolsOptions/Indentation/FileName'
+      , fIndentationFilename, '');
+
     XMLConfig.Flush;
     XMLConfig.Free;
   except
@@ -630,6 +651,10 @@ begin
   FIdentComplAddSemicolon:=true;
   FIdentComplAddAssignOperator:=true;
   FIdentComplAutoStartAfterPoint:=true;
+
+  // indentation
+  fIndentationFilename:=
+    TrimFilename(GetPrimaryConfigPath+PathDelim+DefaultIndentationFilename);
 end;
 
 procedure TCodeToolsOptions.ClearGlobalDefineTemplates;
@@ -706,6 +731,32 @@ begin
   end;
 end;
 
+procedure TCodeToolsOptions.CreateDefaultIndentationFile;
+var
+  res: TLResource;
+  fs: TFileStream;
+begin
+  // indentations (laz_indentation.pas)
+  CopySecondaryConfigFile(DefaultIndentationFilename);
+  if not FileExistsUTF8(IndentationFilename) then
+  begin
+    res := LazarusResources.Find('indentation');
+    if (res <> Nil) and (res.Value <> '') and (res.ValueType = 'PAS') then
+      try
+        InvalidateFileStateCache;
+        fs := TFileStream.Create(UTF8ToSys(IndentationFilename), fmCreate);
+        try
+          fs.Write(res.Value[1], length(res.Value));
+        finally
+          fs.Free;
+        end;
+      except
+        DebugLn('WARNING: unable to write indentation file "',
+          IndentationFilename, '"');
+      end;
+  end;
+end;
+
 procedure TCodeToolsOptions.AssignTo(Dest: TPersistent);
 var
   Boss: TCodeToolManager absolute Dest;
@@ -763,5 +814,6 @@ end;
 
 initialization
   RegisterIDEOptionsGroup(GroupCodetools, TCodeToolsOptions);
+  {$I lazarus_indentation.lrs}
 end.
 
diff --git a/ide/editoroptions.pp b/ide/editoroptions.pp
index 44a46fd20c..3d67b2b9df 100644
--- a/ide/editoroptions.pp
+++ b/ide/editoroptions.pp
@@ -95,7 +95,6 @@ const
   SynEditPreviewExcludeOptions2 = [eoAlwaysVisibleCaret];
 
   DefaultCodeTemplatesFilename = 'lazarus.dci'; // in directory GetPrimaryConfigPath
-  DefaultIndentationFilename = 'laz_indentation.pas'; // in directory GetPrimaryConfigPath
 
 type
   TAdditionalHilightAttribute = (ahaNone, ahaTextBlock, ahaExecutionPoint,
@@ -864,7 +863,6 @@ type
     fAutoToolTipExprEval: Boolean;
     fAutoToolTipSymbTools: Boolean;
     fCodeTemplateFileName: String;
-    fIndentationFilename: String;
     fCTemplIndentToTokenStart: Boolean;
 
     // Code Folding
@@ -1027,8 +1025,6 @@ type
       read fCodeTemplateFileName write fCodeTemplateFileName;
     property CodeTemplateIndentToTokenStart: Boolean
       read fCTemplIndentToTokenStart write fCTemplIndentToTokenStart;
-    property IndentationFileName: String
-      read fIndentationFileName write fIndentationFileName;
     property AutoRemoveEmptyMethods: Boolean read FAutoRemoveEmptyMethods
       write FAutoRemoveEmptyMethods default False;
 
@@ -2393,28 +2389,6 @@ begin
       end;
   end;
 
-  // indentations (laz_indentation.pas)
-  fIndentationFilename:=
-    TrimFilename(GetPrimaryConfigPath+PathDelim+DefaultIndentationFilename);
-  CopySecondaryConfigFile(DefaultIndentationFilename);
-  if not FileExistsUTF8(IndentationFilename) then
-  begin
-    res := LazarusResources.Find('indentation');
-    if (res <> Nil) and (res.Value <> '') and (res.ValueType = 'PAS') then
-      try
-        InvalidateFileStateCache;
-        fs := TFileStream.Create(UTF8ToSys(IndentationFilename), fmCreate);
-        try
-          fs.Write(res.Value[1], length(res.Value));
-        finally
-          fs.Free;
-        end;
-      except
-        DebugLn('WARNING: unable to write indentation file "',
-          IndentationFilename, '"');
-      end;
-  end;
-
   // update translation
   EditorOptionsFoldInfoPas[ 0].Name := dlgFoldPasProcedure;
   EditorOptionsFoldInfoPas[ 1].Name := dlgFoldLocalPasVarType;
@@ -2712,9 +2686,6 @@ begin
     fCTemplIndentToTokenStart :=
       XMLConfig.GetValue(
       'EditorOptions/CodeTools/CodeTemplateIndentToTokenStart/Value', False);
-    fIndentationFilename :=
-      XMLConfig.GetValue('EditorOptions/CodeTools/IndentationFileName'
-      , TrimFilename(GetPrimaryConfigPath + PathDelim +DefaultIndentationFilename));
     fAutoRemoveEmptyMethods :=
       XMLConfig.GetValue('EditorOptions/CodeTools/AutoRemoveEmptyMethods', False);
 
@@ -2933,8 +2904,6 @@ begin
     XMLConfig.SetDeleteValue(
       'EditorOptions/CodeTools/CodeTemplateIndentToTokenStart/Value'
       , fCTemplIndentToTokenStart, False);
-    XMLConfig.SetDeleteValue('EditorOptions/CodeTools/IndentationFileName'
-      , fIndentationFilename, '');
     XMLConfig.SetDeleteValue(
       'EditorOptions/CodeTools/AutoRemoveEmptyMethods'
       , fAutoRemoveEmptyMethods, False);
@@ -4069,7 +4038,6 @@ initialization
   ColorSchemeFactory.RegisterScheme(OCEAN_COLOR_SCHEME.Name, OCEAN_COLOR_SCHEME);
   ColorSchemeFactory.RegisterScheme(DELPHI_COLOR_SCHEME.Name, DELPHI_COLOR_SCHEME);
   {$I lazarus_dci.lrs}
-  {$I lazarus_indentation.lrs}
 
 finalization
   ColorSchemeFactory.Free;
diff --git a/ide/frames/codetools_general_options.lfm b/ide/frames/codetools_general_options.lfm
index 9e852a3fa1..d174be2170 100644
--- a/ide/frames/codetools_general_options.lfm
+++ b/ide/frames/codetools_general_options.lfm
@@ -1,12 +1,12 @@
 inherited CodetoolsGeneralOptionsFrame: TCodetoolsGeneralOptionsFrame
-  Height = 231
+  Height = 403
   Width = 552
-  ClientHeight = 227
-  ClientWidth = 548
+  ClientHeight = 403
+  ClientWidth = 552
   TabOrder = 0
   Visible = False
-  DesignLeft = 176
-  DesignTop = 232
+  DesignLeft = 288
+  DesignTop = 254
   object SrcPathGroupBox: TGroupBox[0]
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = Owner
@@ -15,13 +15,12 @@ inherited CodetoolsGeneralOptionsFrame: TCodetoolsGeneralOptionsFrame
     Left = 0
     Height = 58
     Top = 0
-    Width = 548
-    Anchors = [akTop, akLeft, akRight]
+    Width = 552
+    Align = alTop
     AutoSize = True
     Caption = 'SrcPathGroupBox'
     ClientHeight = 39
-    ClientWidth = 544
-    Ctl3D = False
+    ClientWidth = 548
     TabOrder = 0
     object SrcPathEdit: TEdit
       AnchorSideLeft.Control = SrcPathGroupBox
@@ -30,7 +29,7 @@ inherited CodetoolsGeneralOptionsFrame: TCodetoolsGeneralOptionsFrame
       Left = 6
       Height = 27
       Top = 6
-      Width = 532
+      Width = 536
       Anchors = [akTop, akLeft, akRight]
       BorderSpacing.Around = 6
       TabOrder = 0
@@ -46,14 +45,13 @@ inherited CodetoolsGeneralOptionsFrame: TCodetoolsGeneralOptionsFrame
     Left = 0
     Height = 155
     Top = 64
-    Width = 548
-    Anchors = [akTop, akLeft, akRight]
+    Width = 552
+    Align = alTop
     AutoSize = True
     BorderSpacing.Top = 6
     Caption = 'JumpingGroupBox'
     ClientHeight = 136
-    ClientWidth = 544
-    Ctl3D = False
+    ClientWidth = 548
     TabOrder = 1
     object AdjustTopLineDueToCommentCheckBox: TCheckBox
       AnchorSideLeft.Control = JumpingGroupBox
@@ -61,7 +59,7 @@ inherited CodetoolsGeneralOptionsFrame: TCodetoolsGeneralOptionsFrame
       Left = 6
       Height = 22
       Top = 6
-      Width = 285
+      Width = 277
       BorderSpacing.Around = 6
       Caption = 'AdjustTopLineDueToCommentCheckBox'
       TabOrder = 0
@@ -73,7 +71,7 @@ inherited CodetoolsGeneralOptionsFrame: TCodetoolsGeneralOptionsFrame
       Left = 6
       Height = 22
       Top = 40
-      Width = 181
+      Width = 178
       BorderSpacing.Top = 6
       BorderSpacing.Around = 6
       Caption = 'JumpCenteredCheckBox'
@@ -86,7 +84,7 @@ inherited CodetoolsGeneralOptionsFrame: TCodetoolsGeneralOptionsFrame
       Left = 6
       Height = 22
       Top = 74
-      Width = 205
+      Width = 202
       BorderSpacing.Top = 6
       BorderSpacing.Around = 6
       Caption = 'CursorBeyondEOLCheckBox'
@@ -99,11 +97,69 @@ inherited CodetoolsGeneralOptionsFrame: TCodetoolsGeneralOptionsFrame
       Left = 6
       Height = 22
       Top = 108
-      Width = 252
+      Width = 244
       BorderSpacing.Top = 6
       BorderSpacing.Around = 6
       Caption = 'SkipForwardDeclarationsCheckBox'
       TabOrder = 3
     end
   end
+  object IndentationGroupBox: TGroupBox[2]
+    Left = 0
+    Height = 60
+    Top = 219
+    Width = 552
+    Align = alTop
+    AutoSize = True
+    Caption = 'IndentationGroupBox'
+    ClientHeight = 41
+    ClientWidth = 548
+    TabOrder = 2
+    object IndentFileLabel: TLabel
+      AnchorSideLeft.Control = IndentationGroupBox
+      AnchorSideTop.Control = IndentFileEdit
+      AnchorSideTop.Side = asrCenter
+      Left = 6
+      Height = 18
+      Top = 11
+      Width = 95
+      BorderSpacing.Left = 6
+      Caption = 'IndentFileLabel'
+      ParentColor = False
+    end
+    object IndentFileEdit: TEdit
+      AnchorSideLeft.Control = IndentFileLabel
+      AnchorSideLeft.Side = asrBottom
+      AnchorSideTop.Control = IndentFileButton
+      AnchorSideTop.Side = asrCenter
+      AnchorSideRight.Control = IndentFileButton
+      Left = 107
+      Height = 27
+      Top = 7
+      Width = 320
+      Anchors = [akTop, akLeft, akRight]
+      BorderSpacing.Left = 6
+      BorderSpacing.Top = 6
+      BorderSpacing.Bottom = 6
+      TabOrder = 0
+      Text = 'IndentFileEdit'
+    end
+    object IndentFileButton: TButton
+      AnchorSideTop.Control = IndentationGroupBox
+      AnchorSideRight.Control = IndentationGroupBox
+      AnchorSideRight.Side = asrBottom
+      Left = 427
+      Height = 29
+      Top = 6
+      Width = 115
+      Anchors = [akTop, akRight]
+      AutoSize = True
+      BorderSpacing.Top = 6
+      BorderSpacing.Right = 6
+      BorderSpacing.Bottom = 6
+      Caption = 'IndentFileButton'
+      OnClick = IndentFileButtonClick
+      TabOrder = 1
+    end
+  end
 end
diff --git a/ide/frames/codetools_general_options.lrs b/ide/frames/codetools_general_options.lrs
index 34a85b7ed0..8128addd84 100644
--- a/ide/frames/codetools_general_options.lrs
+++ b/ide/frames/codetools_general_options.lrs
@@ -2,42 +2,60 @@
 
 LazarusResources.Add('TCodetoolsGeneralOptionsFrame','FORMDATA',[
   'TPF0'#241#29'TCodetoolsGeneralOptionsFrame'#28'CodetoolsGeneralOptionsFrame'
-  +#6'Height'#3#231#0#5'Width'#3'('#2#12'ClientHeight'#3#227#0#11'ClientWidth'#3
-  +'$'#2#8'TabOrder'#2#0#7'Visible'#8#10'DesignLeft'#3#176#0#9'DesignTop'#3#232
-  +#0#0#242#2#0#9'TGroupBox'#15'SrcPathGroupBox'#22'AnchorSideLeft.Control'#7#5
-  +'Owner'#21'AnchorSideTop.Control'#7#5'Owner'#23'AnchorSideRight.Control'#7#5
+  +#6'Height'#3#147#1#5'Width'#3'('#2#12'ClientHeight'#3#147#1#11'ClientWidth'#3
+  +'('#2#8'TabOrder'#2#0#7'Visible'#8#10'DesignLeft'#3' '#1#9'DesignTop'#3#254#0
+  +#0#242#2#0#9'TGroupBox'#15'SrcPathGroupBox'#22'AnchorSideLeft.Control'#7#5'O'
+  +'wner'#21'AnchorSideTop.Control'#7#5'Owner'#23'AnchorSideRight.Control'#7#5
   +'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#2':'#3
-  +'Top'#2#0#5'Width'#3'$'#2#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'Au'
-  +'toSize'#9#7'Caption'#6#15'SrcPathGroupBox'#12'ClientHeight'#2''''#11'Client'
-  +'Width'#3' '#2#5'Ctl3D'#8#8'TabOrder'#2#0#0#5'TEdit'#11'SrcPathEdit'#22'Anch'
-  +'orSideLeft.Control'#7#15'SrcPathGroupBox'#23'AnchorSideRight.Control'#7#15
-  +'SrcPathGroupBox'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#6#6'Heig'
-  +'ht'#2#27#3'Top'#2#6#5'Width'#3#20#2#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRi'
-  +'ght'#0#20'BorderSpacing.Around'#2#6#8'TabOrder'#2#0#4'Text'#6#11'SrcPathEdi'
-  +'t'#0#0#0#242#2#1#9'TGroupBox'#15'JumpingGroupBox'#22'AnchorSideLeft.Control'
-  +#7#5'Owner'#21'AnchorSideTop.Control'#7#15'SrcPathGroupBox'#18'AnchorSideTop'
-  +'.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideR'
-  +'ight.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#3#155#0#3'Top'#2'@'#5'Width'
-  +#3'$'#2#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'AutoSize'#9#17'Borde'
-  +'rSpacing.Top'#2#6#7'Caption'#6#15'JumpingGroupBox'#12'ClientHeight'#3#136#0
-  +#11'ClientWidth'#3' '#2#5'Ctl3D'#8#8'TabOrder'#2#1#0#9'TCheckBox!AdjustTopLi'
+  +'Top'#2#0#5'Width'#3'('#2#5'Align'#7#5'alTop'#8'AutoSize'#9#7'Caption'#6#15
+  +'SrcPathGroupBox'#12'ClientHeight'#2''''#11'ClientWidth'#3'$'#2#8'TabOrder'#2
+  +#0#0#5'TEdit'#11'SrcPathEdit'#22'AnchorSideLeft.Control'#7#15'SrcPathGroupBo'
+  +'x'#23'AnchorSideRight.Control'#7#15'SrcPathGroupBox'#20'AnchorSideRight.Sid'
+  +'e'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#27#3'Top'#2#6#5'Width'#3#24#2#7'A'
+  +'nchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#20'BorderSpacing.Around'#2#6#8'T'
+  +'abOrder'#2#0#4'Text'#6#11'SrcPathEdit'#0#0#0#242#2#1#9'TGroupBox'#15'Jumpin'
+  +'gGroupBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7
+  +#15'SrcPathGroupBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRigh'
+  +'t.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#0#6
+  +'Height'#3#155#0#3'Top'#2'@'#5'Width'#3'('#2#5'Align'#7#5'alTop'#8'AutoSize'
+  +#9#17'BorderSpacing.Top'#2#6#7'Caption'#6#15'JumpingGroupBox'#12'ClientHeigh'
+  +'t'#3#136#0#11'ClientWidth'#3'$'#2#8'TabOrder'#2#1#0#9'TCheckBox!AdjustTopLi'
   +'neDueToCommentCheckBox'#22'AnchorSideLeft.Control'#7#15'JumpingGroupBox'#21
   +'AnchorSideTop.Control'#7#15'JumpingGroupBox'#4'Left'#2#6#6'Height'#2#22#3'T'
-  +'op'#2#6#5'Width'#3#29#1#20'BorderSpacing.Around'#2#6#7'Caption'#6'!AdjustTo'
+  +'op'#2#6#5'Width'#3#21#1#20'BorderSpacing.Around'#2#6#7'Caption'#6'!AdjustTo'
   +'pLineDueToCommentCheckBox'#8'TabOrder'#2#0#0#0#9'TCheckBox'#20'JumpCentered'
   +'CheckBox'#22'AnchorSideLeft.Control'#7#15'JumpingGroupBox'#21'AnchorSideTop'
   +'.Control'#7'!AdjustTopLineDueToCommentCheckBox'#18'AnchorSideTop.Side'#7#9
-  +'asrBottom'#4'Left'#2#6#6'Height'#2#22#3'Top'#2'('#5'Width'#3#181#0#17'Borde'
+  +'asrBottom'#4'Left'#2#6#6'Height'#2#22#3'Top'#2'('#5'Width'#3#178#0#17'Borde'
   +'rSpacing.Top'#2#6#20'BorderSpacing.Around'#2#6#7'Caption'#6#20'JumpCentered'
   +'CheckBox'#8'TabOrder'#2#1#0#0#9'TCheckBox'#23'CursorBeyondEOLCheckBox'#22'A'
   +'nchorSideLeft.Control'#7#15'JumpingGroupBox'#21'AnchorSideTop.Control'#7#20
   +'JumpCenteredCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'H'
-  +'eight'#2#22#3'Top'#2'J'#5'Width'#3#205#0#17'BorderSpacing.Top'#2#6#20'Borde'
+  +'eight'#2#22#3'Top'#2'J'#5'Width'#3#202#0#17'BorderSpacing.Top'#2#6#20'Borde'
   +'rSpacing.Around'#2#6#7'Caption'#6#23'CursorBeyondEOLCheckBox'#8'TabOrder'#2
   +#2#0#0#9'TCheckBox'#31'SkipForwardDeclarationsCheckBox'#22'AnchorSideLeft.Co'
   +'ntrol'#7#15'JumpingGroupBox'#21'AnchorSideTop.Control'#7#23'CursorBeyondEOL'
   +'CheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#22#3
-  +'Top'#2'l'#5'Width'#3#252#0#17'BorderSpacing.Top'#2#6#20'BorderSpacing.Aroun'
+  +'Top'#2'l'#5'Width'#3#244#0#17'BorderSpacing.Top'#2#6#20'BorderSpacing.Aroun'
   +'d'#2#6#7'Caption'#6#31'SkipForwardDeclarationsCheckBox'#8'TabOrder'#2#3#0#0
-  +#0#0
+  +#0#242#2#2#9'TGroupBox'#19'IndentationGroupBox'#4'Left'#2#0#6'Height'#2'<'#3
+  +'Top'#3#219#0#5'Width'#3'('#2#5'Align'#7#5'alTop'#8'AutoSize'#9#7'Caption'#6
+  +#19'IndentationGroupBox'#12'ClientHeight'#2')'#11'ClientWidth'#3'$'#2#8'TabO'
+  +'rder'#2#2#0#6'TLabel'#15'IndentFileLabel'#22'AnchorSideLeft.Control'#7#19'I'
+  +'ndentationGroupBox'#21'AnchorSideTop.Control'#7#14'IndentFileEdit'#18'Ancho'
+  +'rSideTop.Side'#7#9'asrCenter'#4'Left'#2#6#6'Height'#2#18#3'Top'#2#11#5'Widt'
+  +'h'#2'_'#18'BorderSpacing.Left'#2#6#7'Caption'#6#15'IndentFileLabel'#11'Pare'
+  +'ntColor'#8#0#0#5'TEdit'#14'IndentFileEdit'#22'AnchorSideLeft.Control'#7#15
+  +'IndentFileLabel'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Co'
+  +'ntrol'#7#16'IndentFileButton'#18'AnchorSideTop.Side'#7#9'asrCenter'#23'Anch'
+  +'orSideRight.Control'#7#16'IndentFileButton'#4'Left'#2'k'#6'Height'#2#27#3'T'
+  +'op'#2#7#5'Width'#3'@'#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'Bo'
+  +'rderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#20'BorderSpacing.Bottom'#2#6
+  +#8'TabOrder'#2#0#4'Text'#6#14'IndentFileEdit'#0#0#7'TButton'#16'IndentFileBu'
+  +'tton'#21'AnchorSideTop.Control'#7#19'IndentationGroupBox'#23'AnchorSideRigh'
+  +'t.Control'#7#19'IndentationGroupBox'#20'AnchorSideRight.Side'#7#9'asrBottom'
+  +#4'Left'#3#171#1#6'Height'#2#29#3'Top'#2#6#5'Width'#2's'#7'Anchors'#11#5'akT'
+  +'op'#7'akRight'#0#8'AutoSize'#9#17'BorderSpacing.Top'#2#6#19'BorderSpacing.R'
+  +'ight'#2#6#20'BorderSpacing.Bottom'#2#6#7'Caption'#6#16'IndentFileButton'#7
+  +'OnClick'#7#21'IndentFileButtonClick'#8'TabOrder'#2#1#0#0#0#0
 ]);
diff --git a/ide/frames/codetools_general_options.pas b/ide/frames/codetools_general_options.pas
index d035156108..b571342dff 100644
--- a/ide/frames/codetools_general_options.pas
+++ b/ide/frames/codetools_general_options.pas
@@ -25,7 +25,8 @@ unit codetools_general_options;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, LResources, Forms, StdCtrls,
+  Classes, SysUtils, FileUtil, LResources, Forms, StdCtrls, Buttons, Dialogs,
+  IDEDialogs,
   CodeToolsOptions, LazarusIDEStrConsts, IDEOptionsIntf;
 
 type
@@ -34,14 +35,18 @@ type
 
   TCodetoolsGeneralOptionsFrame = class(TAbstractIDEOptionsEditor)
     AdjustTopLineDueToCommentCheckBox: TCheckBox;
+    IndentFileButton: TButton;
     CursorBeyondEOLCheckBox: TCheckBox;
+    IndentFileEdit: TEdit;
+    IndentationGroupBox: TGroupBox;
     JumpCenteredCheckBox: TCheckBox;
     JumpingGroupBox: TGroupBox;
+    IndentFileLabel: TLabel;
     SkipForwardDeclarationsCheckBox: TCheckBox;
     SrcPathEdit: TEdit;
     SrcPathGroupBox: TGroupBox;
+    procedure IndentFileButtonClick(Sender: TObject);
   private
-    { private declarations }
   public
     function GetTitle: String; override;
     procedure Setup(ADialog: TAbstractOptionsEditorDialog); override;
@@ -54,6 +59,22 @@ implementation
 
 { TCodetoolsGeneralOptionsFrame }
 
+procedure TCodetoolsGeneralOptionsFrame.IndentFileButtonClick(Sender: TObject);
+var
+  OpenDialog: TOpenDialog;
+begin
+  OpenDialog:=TOpenDialog.Create(nil);
+  try
+    InitIDEFileDialog(OpenDialog);
+    OpenDialog.Title:=lisChooseAPascalFileForIndentationExamples;
+    OpenDialog.Options:=OpenDialog.Options+[ofFileMustExist];
+    if OpenDialog.Execute then
+      IndentFileEdit.Text:=OpenDialog.FileName;
+  finally
+    OpenDialog.Free;
+  end;
+end;
+
 function TCodetoolsGeneralOptionsFrame.GetTitle: String;
 begin
   Result := lisMenuInsertGeneral;
@@ -77,6 +98,10 @@ begin
     Caption:=dlgcursorbeyondeol;
 
   SkipForwardDeclarationsCheckBox.Caption:=dlgSkipForwardDeclarations;
+
+  IndentationGroupBox.Caption:=lisIndentation;
+  IndentFileLabel.Caption:=lisExampleFile;
+  IndentFileButton.Caption:=lisPathEditBrowse;
 end;
 
 procedure TCodetoolsGeneralOptionsFrame.ReadSettings(
@@ -89,6 +114,7 @@ begin
     JumpCenteredCheckBox.Checked := JumpCentered;
     CursorBeyondEOLCheckBox.Checked := CursorBeyondEOL;
     SkipForwardDeclarationsCheckBox.Checked := SkipForwardDeclarations;
+    IndentFileEdit.Text:=IndentationFileName;
   end;
 end;
 
@@ -102,6 +128,7 @@ begin
     JumpCentered := JumpCenteredCheckBox.Checked;
     CursorBeyondEOL := CursorBeyondEOLCheckBox.Checked;
     SkipForwardDeclarations := SkipForwardDeclarationsCheckBox.Checked;
+    IndentationFileName:=IndentFileEdit.Text;
   end;
 end;
 
diff --git a/ide/frames/editor_general_options.lfm b/ide/frames/editor_general_options.lfm
index b051e8f2ed..ba27d8e09a 100644
--- a/ide/frames/editor_general_options.lfm
+++ b/ide/frames/editor_general_options.lfm
@@ -3,18 +3,19 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
   Width = 472
   ClientHeight = 401
   ClientWidth = 472
+  TabOrder = 0
   Visible = False
-  DesignLeft = 290
-  DesignTop = 188
+  DesignLeft = 295
+  DesignTop = 212
   object BlockIndentLabel: TLabel[0]
     AnchorSideLeft.Control = BlockIndentComboBox
     AnchorSideLeft.Side = asrBottom
     AnchorSideTop.Control = BlockIndentComboBox
     AnchorSideTop.Side = asrCenter
     Left = 112
-    Height = 16
-    Top = 198
-    Width = 92
+    Height = 18
+    Top = 224
+    Width = 109
     BorderSpacing.Around = 6
     Caption = 'BlockIndentLabel'
     ParentColor = False
@@ -25,9 +26,9 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     AnchorSideTop.Control = TabWidthsComboBox
     AnchorSideTop.Side = asrCenter
     Left = 342
-    Height = 16
-    Top = 198
-    Width = 86
+    Height = 18
+    Top = 224
+    Width = 98
     BorderSpacing.Around = 6
     Caption = 'TabWidthsLabel'
     ParentColor = False
@@ -39,10 +40,10 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     AnchorSideTop.Side = asrCenter
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
-    Left = 175
+    Left = 204
     Height = 3
-    Top = 7
-    Width = 297
+    Top = 8
+    Width = 268
     Anchors = [akTop, akLeft, akRight]
     BorderSpacing.Left = 10
   end
@@ -51,9 +52,9 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     AnchorSideLeft.Side = asrBottom
     AnchorSideTop.Control = Owner
     Left = 70
-    Height = 16
+    Height = 18
     Top = 0
-    Width = 95
+    Width = 124
     BorderSpacing.Left = 10
     Caption = 'UndoGroupLabel'
     Font.Style = [fsBold]
@@ -66,9 +67,9 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     AnchorSideTop.Control = UndoLimitComboBox
     AnchorSideTop.Side = asrCenter
     Left = 342
-    Height = 16
-    Top = 25
-    Width = 85
+    Height = 18
+    Top = 29
+    Width = 100
     BorderSpacing.Around = 6
     Caption = 'UndoLimitLabel'
     ParentColor = False
@@ -79,9 +80,9 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     AnchorSideTop.Control = GroupUndoCheckBox
     AnchorSideTop.Side = asrBottom
     Left = 70
-    Height = 16
-    Top = 66
-    Width = 96
+    Height = 18
+    Top = 74
+    Width = 126
     BorderSpacing.Left = 10
     BorderSpacing.Top = 6
     Caption = 'ScrollGroupLabel'
@@ -96,10 +97,10 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     AnchorSideTop.Side = asrCenter
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
-    Left = 176
+    Left = 206
     Height = 3
-    Top = 73
-    Width = 296
+    Top = 82
+    Width = 266
     Anchors = [akTop, akLeft, akRight]
     BorderSpacing.Left = 10
   end
@@ -109,9 +110,9 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     AnchorSideTop.Control = HalfPageScrollCheckBox
     AnchorSideTop.Side = asrBottom
     Left = 70
-    Height = 16
-    Top = 132
-    Width = 132
+    Height = 18
+    Top = 148
+    Width = 174
     BorderSpacing.Left = 10
     BorderSpacing.Top = 6
     Caption = 'IndentsTabsGroupLabel'
@@ -126,10 +127,10 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     AnchorSideTop.Side = asrCenter
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
-    Left = 212
+    Left = 254
     Height = 3
-    Top = 139
-    Width = 260
+    Top = 156
+    Width = 218
     Anchors = [akTop, akLeft, akRight]
     BorderSpacing.Left = 10
   end
@@ -139,9 +140,9 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     AnchorSideTop.Control = BlockIndentTypeComboBox
     AnchorSideTop.Side = asrBottom
     Left = 70
-    Height = 16
-    Top = 250
-    Width = 101
+    Height = 18
+    Top = 288
+    Width = 134
     BorderSpacing.Left = 10
     BorderSpacing.Top = 6
     Caption = 'CursorGroupLabel'
@@ -156,10 +157,10 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     AnchorSideTop.Side = asrCenter
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
-    Left = 181
+    Left = 214
     Height = 3
-    Top = 257
-    Width = 291
+    Top = 296
+    Width = 258
     Anchors = [akTop, akLeft, akRight]
     BorderSpacing.Left = 10
   end
@@ -169,9 +170,9 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     AnchorSideTop.Control = BlockIndentTypeComboBox
     AnchorSideTop.Side = asrCenter
     Left = 112
-    Height = 16
-    Top = 224
-    Width = 118
+    Height = 18
+    Top = 257
+    Width = 137
     BorderSpacing.Around = 6
     Caption = 'BlockIndentTypeLabel'
     ParentColor = False
@@ -184,7 +185,7 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     AnchorSideRight.Side = asrBottom
     Left = 0
     Height = 3
-    Top = 7
+    Top = 8
     Width = 60
   end
   object Bevel2a: TBevel[13]
@@ -195,7 +196,7 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     AnchorSideRight.Side = asrBottom
     Left = 0
     Height = 3
-    Top = 73
+    Top = 82
     Width = 60
     Anchors = [akTop, akLeft, akRight]
   end
@@ -207,7 +208,7 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     AnchorSideRight.Side = asrBottom
     Left = 0
     Height = 3
-    Top = 139
+    Top = 156
     Width = 60
     Anchors = [akTop, akLeft, akRight]
   end
@@ -219,7 +220,7 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     AnchorSideRight.Side = asrBottom
     Left = 0
     Height = 3
-    Top = 257
+    Top = 296
     Width = 60
     Anchors = [akTop, akLeft, akRight]
   end
@@ -231,7 +232,7 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     AnchorSideRight.Side = asrBottom
     Left = 0
     Height = 3
-    Top = 361
+    Top = 414
     Width = 60
     Anchors = [akTop, akLeft, akRight]
   end
@@ -241,9 +242,9 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     AnchorSideTop.Control = ScrollPastEndLineCheckBox
     AnchorSideTop.Side = asrBottom
     Left = 70
-    Height = 16
-    Top = 354
-    Width = 96
+    Height = 18
+    Top = 406
+    Width = 126
     BorderSpacing.Left = 10
     BorderSpacing.Top = 6
     Caption = 'BlockGroupLabel'
@@ -258,10 +259,10 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     AnchorSideTop.Side = asrCenter
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
-    Left = 176
+    Left = 206
     Height = 3
-    Top = 361
-    Width = 296
+    Top = 414
+    Width = 266
     Anchors = [akTop, akLeft, akRight]
     BorderSpacing.Left = 10
   end
@@ -271,12 +272,12 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     AnchorSideTop.Side = asrBottom
     AnchorSideBottom.Control = TabWidthsComboBox
     Left = 6
-    Height = 23
-    Top = 195
+    Height = 29
+    Top = 219
     Width = 100
     BorderSpacing.Left = 6
     BorderSpacing.Top = 3
-    ItemHeight = 15
+    ItemHeight = 0
     Items.Strings = (
       '1'
       '2'
@@ -294,10 +295,10 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     AnchorSideBottom.Control = Owner
     AnchorSideBottom.Side = asrBottom
     Left = 236
-    Height = 23
-    Top = 195
+    Height = 29
+    Top = 219
     Width = 100
-    ItemHeight = 15
+    ItemHeight = 0
     Items.Strings = (
       '1'
       '2'
@@ -314,12 +315,12 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     AnchorSideTop.Control = UndoGroupLabel
     AnchorSideTop.Side = asrBottom
     Left = 236
-    Height = 23
-    Top = 22
+    Height = 29
+    Top = 24
     Width = 100
     BorderSpacing.Left = 230
     BorderSpacing.Around = 6
-    ItemHeight = 15
+    ItemHeight = 0
     Items.Strings = (
       '32767'
       '4096'
@@ -335,9 +336,9 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     AnchorSideTop.Control = UndoAfterSaveCheckBox
     AnchorSideTop.Side = asrBottom
     Left = 6
-    Height = 19
-    Top = 41
-    Width = 134
+    Height = 22
+    Top = 46
+    Width = 160
     BorderSpacing.Left = 6
     Caption = 'GroupUndoCheckBox'
     OnChange = GroupUndoCheckBoxChange
@@ -348,9 +349,9 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     AnchorSideTop.Control = UndoGroupLabel
     AnchorSideTop.Side = asrBottom
     Left = 6
-    Height = 19
-    Top = 22
-    Width = 151
+    Height = 22
+    Top = 24
+    Width = 184
     BorderSpacing.Left = 6
     BorderSpacing.Top = 6
     Caption = 'UndoAfterSaveCheckBox'
@@ -361,9 +362,9 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     AnchorSideTop.Control = ScrollGroupLabel
     AnchorSideTop.Side = asrBottom
     Left = 6
-    Height = 19
-    Top = 88
-    Width = 161
+    Height = 22
+    Top = 98
+    Width = 193
     BorderSpacing.Left = 6
     BorderSpacing.Top = 6
     Caption = 'ScrollPastEndFileCheckBox'
@@ -375,9 +376,9 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     AnchorSideTop.Control = AlwaysVisibleCursorCheckBox
     AnchorSideTop.Side = asrBottom
     Left = 6
-    Height = 19
-    Top = 329
-    Width = 165
+    Height = 22
+    Top = 378
+    Width = 199
     BorderSpacing.Left = 6
     Caption = 'ScrollPastEndLineCheckBox'
     OnChange = ScrollPastEndLineCheckBoxChange
@@ -388,9 +389,9 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     AnchorSideTop.Control = ScrollGroupLabel
     AnchorSideTop.Side = asrBottom
     Left = 236
-    Height = 19
-    Top = 88
-    Width = 158
+    Height = 22
+    Top = 98
+    Width = 193
     BorderSpacing.Left = 230
     BorderSpacing.Around = 6
     Caption = 'ScrollByOneLessCheckBox'
@@ -402,9 +403,9 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     AnchorSideTop.Control = ScrollPastEndFileCheckBox
     AnchorSideTop.Side = asrBottom
     Left = 6
-    Height = 19
-    Top = 107
-    Width = 149
+    Height = 22
+    Top = 120
+    Width = 178
     BorderSpacing.Left = 6
     Caption = 'HalfPageScrollCheckBox'
     OnChange = HalfPageScrollCheckBoxChange
@@ -415,9 +416,9 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     AnchorSideTop.Control = IndentsTabsGroupLabel
     AnchorSideTop.Side = asrBottom
     Left = 6
-    Height = 19
-    Top = 154
-    Width = 132
+    Height = 22
+    Top = 172
+    Width = 157
     BorderSpacing.Left = 6
     BorderSpacing.Top = 6
     Caption = 'AutoIndentCheckBox'
@@ -429,9 +430,9 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     AnchorSideTop.Control = AutoIndentCheckBox
     AnchorSideTop.Side = asrBottom
     Left = 6
-    Height = 19
-    Top = 173
-    Width = 160
+    Height = 22
+    Top = 194
+    Width = 189
     BorderSpacing.Left = 6
     Caption = 'TabIndentBlocksCheckBox'
     OnChange = TabIndentBlocksCheckBoxChange
@@ -442,9 +443,9 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     AnchorSideTop.Control = IndentsTabsGroupLabel
     AnchorSideTop.Side = asrBottom
     Left = 236
-    Height = 19
-    Top = 154
-    Width = 128
+    Height = 22
+    Top = 172
+    Width = 155
     BorderSpacing.Left = 230
     BorderSpacing.Around = 6
     Caption = 'SmartTabsCheckBox'
@@ -455,9 +456,9 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     AnchorSideLeft.Control = SmartTabsCheckBox
     AnchorSideTop.Control = TabIndentBlocksCheckBox
     Left = 236
-    Height = 19
-    Top = 173
-    Width = 147
+    Height = 22
+    Top = 194
+    Width = 175
     Caption = 'TabsToSpacesCheckBox'
     OnChange = TabsToSpacesCheckBoxChange
     TabOrder = 12
@@ -467,9 +468,9 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     AnchorSideTop.Control = CursorGroupLabel
     AnchorSideTop.Side = asrBottom
     Left = 6
-    Height = 19
-    Top = 272
-    Width = 140
+    Height = 22
+    Top = 312
+    Width = 167
     BorderSpacing.Left = 6
     BorderSpacing.Top = 6
     Caption = 'KeepCursorXCheckBox'
@@ -481,9 +482,9 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     AnchorSideTop.Control = KeepCursorXCheckBox
     AnchorSideTop.Side = asrBottom
     Left = 6
-    Height = 19
-    Top = 291
-    Width = 158
+    Height = 22
+    Top = 334
+    Width = 193
     BorderSpacing.Left = 6
     Caption = 'PersistentCursorCheckBox'
     OnChange = PersistentCursorCheckBoxChange
@@ -494,9 +495,9 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     AnchorSideTop.Control = PersistentCursorCheckBox
     AnchorSideTop.Side = asrBottom
     Left = 6
-    Height = 19
-    Top = 310
-    Width = 178
+    Height = 22
+    Top = 356
+    Width = 213
     BorderSpacing.Left = 6
     Caption = 'AlwaysVisibleCursorCheckBox'
     OnChange = AlwaysVisibleCursorCheckBoxChange
@@ -507,9 +508,9 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     AnchorSideTop.Control = CursorGroupLabel
     AnchorSideTop.Side = asrBottom
     Left = 236
-    Height = 19
-    Top = 272
-    Width = 182
+    Height = 22
+    Top = 312
+    Width = 222
     BorderSpacing.Left = 230
     BorderSpacing.Around = 6
     Caption = 'CursorSkipsSelectionCheckBox'
@@ -520,9 +521,9 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     AnchorSideLeft.Control = CursorSkipsSelectionCheckBox
     AnchorSideTop.Control = AlwaysVisibleCursorCheckBox
     Left = 236
-    Height = 19
-    Top = 310
-    Width = 236
+    Height = 22
+    Top = 356
+    Width = 283
     Caption = 'HomeKeyJumpsToNearestStartCheckBox'
     OnChange = HomeKeyJumpsToNearestStartCheckBoxChange
     TabOrder = 17
@@ -531,9 +532,9 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     AnchorSideLeft.Control = HomeKeyJumpsToNearestStartCheckBox
     AnchorSideTop.Control = ScrollPastEndLineCheckBox
     Left = 236
-    Height = 19
-    Top = 329
-    Width = 223
+    Height = 22
+    Top = 378
+    Width = 268
     Caption = 'EndKeyJumpsToNearestStartCheckBox'
     OnChange = EndKeyJumpsToNearestStartCheckBoxChange
     TabOrder = 18
@@ -544,12 +545,12 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     AnchorSideTop.Side = asrBottom
     AnchorSideBottom.Control = TabWidthsComboBox
     Left = 6
-    Height = 23
-    Top = 221
+    Height = 31
+    Top = 251
     Width = 100
     BorderSpacing.Left = 6
     BorderSpacing.Top = 3
-    ItemHeight = 15
+    ItemHeight = 0
     ItemWidth = 200
     OnChange = ComboboxOnChange
     OnExit = ComboBoxOnExit
@@ -562,9 +563,9 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     AnchorSideTop.Control = BlockGroupLabel
     AnchorSideTop.Side = asrBottom
     Left = 6
-    Height = 19
-    Top = 376
-    Width = 152
+    Height = 22
+    Top = 430
+    Width = 185
     BorderSpacing.Left = 6
     BorderSpacing.Top = 6
     Caption = 'PersistentBlockCheckBox'
@@ -576,9 +577,9 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     AnchorSideTop.Control = BlockGroupLabel
     AnchorSideTop.Side = asrBottom
     Left = 236
-    Height = 19
-    Top = 376
-    Width = 152
+    Height = 22
+    Top = 430
+    Width = 181
     BorderSpacing.Left = 230
     BorderSpacing.Around = 6
     Caption = 'OverwriteBlockCheckBox'
@@ -589,9 +590,9 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     AnchorSideLeft.Control = CursorSkipsSelectionCheckBox
     AnchorSideTop.Control = PersistentCursorCheckBox
     Left = 236
-    Height = 19
-    Top = 291
-    Width = 154
+    Height = 22
+    Top = 334
+    Width = 184
     Caption = 'CursorSkipsTabCheckBox'
     OnChange = CursorSkipsTabCheckBoxChange
     TabOrder = 22
diff --git a/ide/frames/editor_general_options.lrs b/ide/frames/editor_general_options.lrs
index 8a76f4d731..283e549e02 100644
--- a/ide/frames/editor_general_options.lrs
+++ b/ide/frames/editor_general_options.lrs
@@ -3,223 +3,223 @@
 LazarusResources.Add('TEditorGeneralOptionsFrame','FORMDATA',[
   'TPF0'#241#26'TEditorGeneralOptionsFrame'#25'EditorGeneralOptionsFrame'#6'Hei'
   +'ght'#3#145#1#5'Width'#3#216#1#12'ClientHeight'#3#145#1#11'ClientWidth'#3#216
-  +#1#7'Visible'#8#10'DesignLeft'#3'"'#1#9'DesignTop'#3#188#0#0#242#2#0#6'TLabe'
-  +'l'#16'BlockIndentLabel'#22'AnchorSideLeft.Control'#7#19'BlockIndentComboBox'
-  +#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#19'Block'
-  +'IndentComboBox'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2'p'#6'Height'
-  +#2#16#3'Top'#3#198#0#5'Width'#2'\'#20'BorderSpacing.Around'#2#6#7'Caption'#6
-  +#16'BlockIndentLabel'#11'ParentColor'#8#0#0#242#2#1#6'TLabel'#14'TabWidthsLa'
-  +'bel'#22'AnchorSideLeft.Control'#7#17'TabWidthsComboBox'#19'AnchorSideLeft.S'
-  +'ide'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#17'TabWidthsComboBox'#18'An'
-  +'chorSideTop.Side'#7#9'asrCenter'#4'Left'#3'V'#1#6'Height'#2#16#3'Top'#3#198
-  +#0#5'Width'#2'V'#20'BorderSpacing.Around'#2#6#7'Caption'#6#14'TabWidthsLabel'
-  +#11'ParentColor'#8#0#0#242#2#2#6'TBevel'#6'Bevel1'#22'AnchorSideLeft.Control'
-  +#7#14'UndoGroupLabel'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTo'
-  +'p.Control'#7#14'UndoGroupLabel'#18'AnchorSideTop.Side'#7#9'asrCenter'#23'An'
-  +'chorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4
-  +'Left'#3#175#0#6'Height'#2#3#3'Top'#2#7#5'Width'#3')'#1#7'Anchors'#11#5'akTo'
-  +'p'#6'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#2#10#0#0#242#2#3#6'TLabel'
-  +#14'UndoGroupLabel'#22'AnchorSideLeft.Control'#7#7'Bevel1a'#19'AnchorSideLef'
-  +'t.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#5'Owner'#4'Left'#2'F'#6
-  +'Height'#2#16#3'Top'#2#0#5'Width'#2'_'#18'BorderSpacing.Left'#2#10#7'Caption'
-  +#6#14'UndoGroupLabel'#10'Font.Style'#11#6'fsBold'#0#11'ParentColor'#8#10'Par'
-  +'entFont'#8#0#0#242#2#4#6'TLabel'#14'UndoLimitLabel'#22'AnchorSideLeft.Contr'
-  +'ol'#7#17'UndoLimitComboBox'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'Ancho'
-  +'rSideTop.Control'#7#17'UndoLimitComboBox'#18'AnchorSideTop.Side'#7#9'asrCen'
-  +'ter'#4'Left'#3'V'#1#6'Height'#2#16#3'Top'#2#25#5'Width'#2'U'#20'BorderSpaci'
-  +'ng.Around'#2#6#7'Caption'#6#14'UndoLimitLabel'#11'ParentColor'#8#0#0#242#2#5
-  +#6'TLabel'#16'ScrollGroupLabel'#22'AnchorSideLeft.Control'#7#7'Bevel2a'#19'A'
-  +'nchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#17'GroupUndo'
-  +'CheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2'F'#6'Height'#2#16
-  +#3'Top'#2'B'#5'Width'#2'`'#18'BorderSpacing.Left'#2#10#17'BorderSpacing.Top'
-  +#2#6#7'Caption'#6#16'ScrollGroupLabel'#10'Font.Style'#11#6'fsBold'#0#11'Pare'
-  +'ntColor'#8#10'ParentFont'#8#0#0#242#2#6#6'TBevel'#6'Bevel2'#22'AnchorSideLe'
-  +'ft.Control'#7#16'ScrollGroupLabel'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21
-  +'AnchorSideTop.Control'#7#16'ScrollGroupLabel'#18'AnchorSideTop.Side'#7#9'as'
-  +'rCenter'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9
-  +'asrBottom'#4'Left'#3#176#0#6'Height'#2#3#3'Top'#2'I'#5'Width'#3'('#1#7'Anch'
-  +'ors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#2#10#0#0#242
-  +#2#7#6'TLabel'#21'IndentsTabsGroupLabel'#22'AnchorSideLeft.Control'#7#7'Beve'
-  +'l3a'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#22
-  +'HalfPageScrollCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2'F'#6
-  +'Height'#2#16#3'Top'#3#132#0#5'Width'#3#132#0#18'BorderSpacing.Left'#2#10#17
-  +'BorderSpacing.Top'#2#6#7'Caption'#6#21'IndentsTabsGroupLabel'#10'Font.Style'
-  +#11#6'fsBold'#0#11'ParentColor'#8#10'ParentFont'#8#0#0#242#2#8#6'TBevel'#6'B'
-  +'evel3'#22'AnchorSideLeft.Control'#7#21'IndentsTabsGroupLabel'#19'AnchorSide'
-  +'Left.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#21'IndentsTabsGroupLa'
-  +'bel'#18'AnchorSideTop.Side'#7#9'asrCenter'#23'AnchorSideRight.Control'#7#5
-  +'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#212#0#6'Height'#2#3
-  +#3'Top'#3#139#0#5'Width'#3#4#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0
-  +#18'BorderSpacing.Left'#2#10#0#0#242#2#9#6'TLabel'#16'CursorGroupLabel'#22'A'
-  +'nchorSideLeft.Control'#7#7'Bevel5a'#19'AnchorSideLeft.Side'#7#9'asrBottom'
-  +#21'AnchorSideTop.Control'#7#23'BlockIndentTypeComboBox'#18'AnchorSideTop.Si'
-  +'de'#7#9'asrBottom'#4'Left'#2'F'#6'Height'#2#16#3'Top'#3#250#0#5'Width'#2'e'
-  +#18'BorderSpacing.Left'#2#10#17'BorderSpacing.Top'#2#6#7'Caption'#6#16'Curso'
-  +'rGroupLabel'#10'Font.Style'#11#6'fsBold'#0#11'ParentColor'#8#10'ParentFont'
-  +#8#0#0#242#2#10#6'TBevel'#6'Bevel5'#22'AnchorSideLeft.Control'#7#16'CursorGr'
+  +#1#8'TabOrder'#2#0#7'Visible'#8#10'DesignLeft'#3''''#1#9'DesignTop'#3#212#0#0
+  +#242#2#0#6'TLabel'#16'BlockIndentLabel'#22'AnchorSideLeft.Control'#7#19'Bloc'
+  +'kIndentComboBox'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Co'
+  +'ntrol'#7#19'BlockIndentComboBox'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Le'
+  +'ft'#2'p'#6'Height'#2#18#3'Top'#3#224#0#5'Width'#2'm'#20'BorderSpacing.Aroun'
+  +'d'#2#6#7'Caption'#6#16'BlockIndentLabel'#11'ParentColor'#8#0#0#242#2#1#6'TL'
+  +'abel'#14'TabWidthsLabel'#22'AnchorSideLeft.Control'#7#17'TabWidthsComboBox'
+  +#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#17'TabWi'
+  +'dthsComboBox'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#3'V'#1#6'Height'
+  +#2#18#3'Top'#3#224#0#5'Width'#2'b'#20'BorderSpacing.Around'#2#6#7'Caption'#6
+  +#14'TabWidthsLabel'#11'ParentColor'#8#0#0#242#2#2#6'TBevel'#6'Bevel1'#22'Anc'
+  +'horSideLeft.Control'#7#14'UndoGroupLabel'#19'AnchorSideLeft.Side'#7#9'asrBo'
+  +'ttom'#21'AnchorSideTop.Control'#7#14'UndoGroupLabel'#18'AnchorSideTop.Side'
+  +#7#9'asrCenter'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Si'
+  +'de'#7#9'asrBottom'#4'Left'#3#204#0#6'Height'#2#3#3'Top'#2#8#5'Width'#3#12#1
+  +#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#2#10#0
+  +#0#242#2#3#6'TLabel'#14'UndoGroupLabel'#22'AnchorSideLeft.Control'#7#7'Bevel'
+  +'1a'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#5'Ow'
+  +'ner'#4'Left'#2'F'#6'Height'#2#18#3'Top'#2#0#5'Width'#2'|'#18'BorderSpacing.'
+  +'Left'#2#10#7'Caption'#6#14'UndoGroupLabel'#10'Font.Style'#11#6'fsBold'#0#11
+  +'ParentColor'#8#10'ParentFont'#8#0#0#242#2#4#6'TLabel'#14'UndoLimitLabel'#22
+  +'AnchorSideLeft.Control'#7#17'UndoLimitComboBox'#19'AnchorSideLeft.Side'#7#9
+  +'asrBottom'#21'AnchorSideTop.Control'#7#17'UndoLimitComboBox'#18'AnchorSideT'
+  +'op.Side'#7#9'asrCenter'#4'Left'#3'V'#1#6'Height'#2#18#3'Top'#2#29#5'Width'#2
+  +'d'#20'BorderSpacing.Around'#2#6#7'Caption'#6#14'UndoLimitLabel'#11'ParentCo'
+  +'lor'#8#0#0#242#2#5#6'TLabel'#16'ScrollGroupLabel'#22'AnchorSideLeft.Control'
+  +#7#7'Bevel2a'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Contro'
+  +'l'#7#17'GroupUndoCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2
+  +'F'#6'Height'#2#18#3'Top'#2'J'#5'Width'#2'~'#18'BorderSpacing.Left'#2#10#17
+  +'BorderSpacing.Top'#2#6#7'Caption'#6#16'ScrollGroupLabel'#10'Font.Style'#11#6
+  +'fsBold'#0#11'ParentColor'#8#10'ParentFont'#8#0#0#242#2#6#6'TBevel'#6'Bevel2'
+  +#22'AnchorSideLeft.Control'#7#16'ScrollGroupLabel'#19'AnchorSideLeft.Side'#7
+  +#9'asrBottom'#21'AnchorSideTop.Control'#7#16'ScrollGroupLabel'#18'AnchorSide'
+  +'Top.Side'#7#9'asrCenter'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSi'
+  +'deRight.Side'#7#9'asrBottom'#4'Left'#3#206#0#6'Height'#2#3#3'Top'#2'R'#5'Wi'
+  +'dth'#3#10#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpacing.'
+  +'Left'#2#10#0#0#242#2#7#6'TLabel'#21'IndentsTabsGroupLabel'#22'AnchorSideLef'
+  +'t.Control'#7#7'Bevel3a'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSid'
+  +'eTop.Control'#7#22'HalfPageScrollCheckBox'#18'AnchorSideTop.Side'#7#9'asrBo'
+  +'ttom'#4'Left'#2'F'#6'Height'#2#18#3'Top'#3#148#0#5'Width'#3#174#0#18'Border'
+  +'Spacing.Left'#2#10#17'BorderSpacing.Top'#2#6#7'Caption'#6#21'IndentsTabsGro'
+  +'upLabel'#10'Font.Style'#11#6'fsBold'#0#11'ParentColor'#8#10'ParentFont'#8#0
+  +#0#242#2#8#6'TBevel'#6'Bevel3'#22'AnchorSideLeft.Control'#7#21'IndentsTabsGr'
   +'oupLabel'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7
-  +#16'CursorGroupLabel'#18'AnchorSideTop.Side'#7#9'asrCenter'#23'AnchorSideRig'
-  +'ht.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#181
-  +#0#6'Height'#2#3#3'Top'#3#1#1#5'Width'#3'#'#1#7'Anchors'#11#5'akTop'#6'akLef'
-  +'t'#7'akRight'#0#18'BorderSpacing.Left'#2#10#0#0#242#2#11#6'TLabel'#20'Block'
-  +'IndentTypeLabel'#22'AnchorSideLeft.Control'#7#23'BlockIndentTypeComboBox'#19
-  +'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#23'BlockInd'
-  +'entTypeComboBox'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2'p'#6'Heigh'
-  ,'t'#2#16#3'Top'#3#224#0#5'Width'#2'v'#20'BorderSpacing.Around'#2#6#7'Caption'
-  +#6#20'BlockIndentTypeLabel'#11'ParentColor'#8#0#0#242#2#12#6'TBevel'#7'Bevel'
-  +'1a'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#14'Un'
-  +'doGroupLabel'#18'AnchorSideTop.Side'#7#9'asrCenter'#23'AnchorSideRight.Cont'
-  +'rol'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#0#6'Heigh'
-  +'t'#2#3#3'Top'#2#7#5'Width'#2'<'#0#0#242#2#13#6'TBevel'#7'Bevel2a'#22'Anchor'
-  +'SideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#16'ScrollGroupLabe'
-  +'l'#18'AnchorSideTop.Side'#7#9'asrCenter'#23'AnchorSideRight.Control'#7#7'Be'
-  +'vel1a'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#2#3#3
-  +'Top'#2'I'#5'Width'#2'<'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#0#0
-  +#242#2#14#6'TBevel'#7'Bevel3a'#22'AnchorSideLeft.Control'#7#5'Owner'#21'Anch'
-  +'orSideTop.Control'#7#21'IndentsTabsGroupLabel'#18'AnchorSideTop.Side'#7#9'a'
-  +'srCenter'#23'AnchorSideRight.Control'#7#7'Bevel1a'#20'AnchorSideRight.Side'
-  +#7#9'asrBottom'#4'Left'#2#0#6'Height'#2#3#3'Top'#3#139#0#5'Width'#2'<'#7'Anc'
-  +'hors'#11#5'akTop'#6'akLeft'#7'akRight'#0#0#0#242#2#15#6'TBevel'#7'Bevel5a'
-  +#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#16'Cursor'
-  +'GroupLabel'#18'AnchorSideTop.Side'#7#9'asrCenter'#23'AnchorSideRight.Contro'
-  +'l'#7#7'Bevel1a'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#0#6'Heigh'
-  +'t'#2#3#3'Top'#3#1#1#5'Width'#2'<'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRigh'
-  +'t'#0#0#0#242#2#16#6'TBevel'#7'Bevel6a'#22'AnchorSideLeft.Control'#7#5'Owner'
-  +#21'AnchorSideTop.Control'#7#15'BlockGroupLabel'#18'AnchorSideTop.Side'#7#9
-  +'asrCenter'#23'AnchorSideRight.Control'#7#7'Bevel1a'#20'AnchorSideRight.Side'
-  +#7#9'asrBottom'#4'Left'#2#0#6'Height'#2#3#3'Top'#3'i'#1#5'Width'#2'<'#7'Anch'
-  +'ors'#11#5'akTop'#6'akLeft'#7'akRight'#0#0#0#242#2#17#6'TLabel'#15'BlockGrou'
-  +'pLabel'#22'AnchorSideLeft.Control'#7#7'Bevel5a'#19'AnchorSideLeft.Side'#7#9
-  +'asrBottom'#21'AnchorSideTop.Control'#7#25'ScrollPastEndLineCheckBox'#18'Anc'
-  +'horSideTop.Side'#7#9'asrBottom'#4'Left'#2'F'#6'Height'#2#16#3'Top'#3'b'#1#5
-  +'Width'#2'`'#18'BorderSpacing.Left'#2#10#17'BorderSpacing.Top'#2#6#7'Caption'
-  +#6#15'BlockGroupLabel'#10'Font.Style'#11#6'fsBold'#0#11'ParentColor'#8#10'Pa'
-  +'rentFont'#8#0#0#242#2#18#6'TBevel'#6'Bevel6'#22'AnchorSideLeft.Control'#7#15
-  +'BlockGroupLabel'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Co'
-  +'ntrol'#7#15'BlockGroupLabel'#18'AnchorSideTop.Side'#7#9'asrCenter'#23'Ancho'
-  +'rSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Le'
-  +'ft'#3#176#0#6'Height'#2#3#3'Top'#3'i'#1#5'Width'#3'('#1#7'Anchors'#11#5'akT'
-  +'op'#6'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#2#10#0#0#242#2#19#9'TComb'
-  +'oBox'#19'BlockIndentComboBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'Anch'
-  +'orSideTop.Control'#7#23'TabIndentBlocksCheckBox'#18'AnchorSideTop.Side'#7#9
-  +'asrBottom'#24'AnchorSideBottom.Control'#7#17'TabWidthsComboBox'#4'Left'#2#6
-  +#6'Height'#2#23#3'Top'#3#195#0#5'Width'#2'd'#18'BorderSpacing.Left'#2#6#17'B'
-  +'orderSpacing.Top'#2#3#10'ItemHeight'#2#15#13'Items.Strings'#1#6#1'1'#6#1'2'
-  +#6#1'4'#6#1'8'#0#8'OnChange'#7#16'ComboboxOnChange'#6'OnExit'#7#14'ComboBoxO'
-  +'nExit'#9'OnKeyDown'#7#17'ComboboxOnKeyDown'#8'TabOrder'#2#0#0#0#242#2#20#9
-  +'TComboBox'#17'TabWidthsComboBox'#22'AnchorSideLeft.Control'#7#17'SmartTabsC'
-  +'heckBox'#21'AnchorSideTop.Control'#7#19'BlockIndentComboBox'#24'AnchorSideB'
-  +'ottom.Control'#7#5'Owner'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3
-  +#236#0#6'Height'#2#23#3'Top'#3#195#0#5'Width'#2'd'#10'ItemHeight'#2#15#13'It'
-  +'ems.Strings'#1#6#1'1'#6#1'2'#6#1'4'#6#1'8'#0#8'OnChange'#7#16'ComboboxOnCha'
-  +'nge'#6'OnExit'#7#14'ComboBoxOnExit'#9'OnKeyDown'#7#17'ComboboxOnKeyDown'#8
-  +'TabOrder'#2#1#0#0#242#2#21#9'TComboBox'#17'UndoLimitComboBox'#22'AnchorSide'
-  +'Left.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#14'UndoGroupLabel'#18
-  +'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#3#236#0#6'Height'#2#23#3'Top'#2
-  +#22#5'Width'#2'd'#18'BorderSpacing.Left'#3#230#0#20'BorderSpacing.Around'#2#6
-  +#10'ItemHeight'#2#15#13'Items.Strings'#1#6#5'32767'#6#4'4096'#6#3'512'#0#8'O'
-  +'nChange'#7#16'ComboboxOnChange'#6'OnExit'#7#14'ComboBoxOnExit'#9'OnKeyDown'
-  +#7#17'ComboboxOnKeyDown'#8'TabOrder'#2#2#0#0#242#2#22#9'TCheckBox'#17'GroupU'
-  +'ndoCheckBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'
-  +#7#21'UndoAfterSaveCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2
-  +#6#6'Height'#2#19#3'Top'#2')'#5'Width'#3#134#0#18'BorderSpacing.Left'#2#6#7
-  +'Caption'#6#17'GroupUndoCheckBox'#8'OnChange'#7#23'GroupUndoCheckBoxChange'#8
-  +'TabOrder'#2#3#0#0#242#2#23#9'TCheckBox'#21'UndoAfterSaveCheckBox'#22'Anchor'
-  +'SideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#14'UndoGroupLabel'
-  +#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#19#3'Top'#2#22
-  +#5'Width'#3#151#0#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#7'Cap'
-  +'tion'#6#21'UndoAfterSaveCheckBox'#8'TabOrder'#2#4#0#0#242#2#24#9'TCheckBox'
-  ,#25'ScrollPastEndFileCheckBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'Anch'
-  +'orSideTop.Control'#7#16'ScrollGroupLabel'#18'AnchorSideTop.Side'#7#9'asrBot'
-  +'tom'#4'Left'#2#6#6'Height'#2#19#3'Top'#2'X'#5'Width'#3#161#0#18'BorderSpaci'
-  +'ng.Left'#2#6#17'BorderSpacing.Top'#2#6#7'Caption'#6#25'ScrollPastEndFileChe'
-  +'ckBox'#8'OnChange'#7#31'ScrollPastEndFileCheckBoxChange'#8'TabOrder'#2#5#0#0
-  +#242#2#25#9'TCheckBox'#25'ScrollPastEndLineCheckBox'#22'AnchorSideLeft.Contr'
-  +'ol'#7#5'Owner'#21'AnchorSideTop.Control'#7#27'AlwaysVisibleCursorCheckBox'
-  +#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#19#3'Top'#3'I'
-  +#1#5'Width'#3#165#0#18'BorderSpacing.Left'#2#6#7'Caption'#6#25'ScrollPastEnd'
-  +'LineCheckBox'#8'OnChange'#7#31'ScrollPastEndLineCheckBoxChange'#8'TabOrder'
-  +#2#6#0#0#242#2#26#9'TCheckBox'#23'ScrollByOneLessCheckBox'#22'AnchorSideLeft'
-  +'.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#16'ScrollGroupLabel'#18'An'
-  +'chorSideTop.Side'#7#9'asrBottom'#4'Left'#3#236#0#6'Height'#2#19#3'Top'#2'X'
-  +#5'Width'#3#158#0#18'BorderSpacing.Left'#3#230#0#20'BorderSpacing.Around'#2#6
-  +#7'Caption'#6#23'ScrollByOneLessCheckBox'#8'OnChange'#7#29'ScrollByOneLessCh'
-  +'eckBoxChange'#8'TabOrder'#2#7#0#0#242#2#27#9'TCheckBox'#22'HalfPageScrollCh'
-  +'eckBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#25
-  +'ScrollPastEndFileCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6
-  +#6'Height'#2#19#3'Top'#2'k'#5'Width'#3#149#0#18'BorderSpacing.Left'#2#6#7'Ca'
-  +'ption'#6#22'HalfPageScrollCheckBox'#8'OnChange'#7#28'HalfPageScrollCheckBox'
-  +'Change'#8'TabOrder'#2#8#0#0#242#2#28#9'TCheckBox'#18'AutoIndentCheckBox'#22
-  +'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#21'IndentsTa'
-  +'bsGroupLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2
-  +#19#3'Top'#3#154#0#5'Width'#3#132#0#18'BorderSpacing.Left'#2#6#17'BorderSpac'
-  +'ing.Top'#2#6#7'Caption'#6#18'AutoIndentCheckBox'#8'OnChange'#7#24'AutoInden'
-  +'tCheckBoxChange'#8'TabOrder'#2#9#0#0#242#2#29#9'TCheckBox'#23'TabIndentBloc'
-  +'ksCheckBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'
-  +#7#18'AutoIndentCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6
-  +'Height'#2#19#3'Top'#3#173#0#5'Width'#3#160#0#18'BorderSpacing.Left'#2#6#7'C'
-  +'aption'#6#23'TabIndentBlocksCheckBox'#8'OnChange'#7#29'TabIndentBlocksCheck'
-  +'BoxChange'#8'TabOrder'#2#10#0#0#242#2#30#9'TCheckBox'#17'SmartTabsCheckBox'
-  +#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#21'Indent'
-  +'sTabsGroupLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#3#236#0#6'He'
-  +'ight'#2#19#3'Top'#3#154#0#5'Width'#3#128#0#18'BorderSpacing.Left'#3#230#0#20
-  +'BorderSpacing.Around'#2#6#7'Caption'#6#17'SmartTabsCheckBox'#8'OnChange'#7
-  +#23'SmartTabsCheckBoxChange'#8'TabOrder'#2#11#0#0#242#2#31#9'TCheckBox'#20'T'
-  +'absToSpacesCheckBox'#22'AnchorSideLeft.Control'#7#17'SmartTabsCheckBox'#21
-  +'AnchorSideTop.Control'#7#23'TabIndentBlocksCheckBox'#4'Left'#3#236#0#6'Heig'
-  +'ht'#2#19#3'Top'#3#173#0#5'Width'#3#147#0#7'Caption'#6#20'TabsToSpacesCheckB'
-  +'ox'#8'OnChange'#7#26'TabsToSpacesCheckBoxChange'#8'TabOrder'#2#12#0#0#242#2
-  +' '#9'TCheckBox'#19'KeepCursorXCheckBox'#22'AnchorSideLeft.Control'#7#5'Owne'
-  +'r'#21'AnchorSideTop.Control'#7#16'CursorGroupLabel'#18'AnchorSideTop.Side'#7
-  +#9'asrBottom'#4'Left'#2#6#6'Height'#2#19#3'Top'#3#16#1#5'Width'#3#140#0#18'B'
-  +'orderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#7'Caption'#6#19'KeepCursor'
-  +'XCheckBox'#8'OnChange'#7#25'KeepCursorXCheckBoxChange'#8'TabOrder'#2#13#0#0
-  +#242#2'!'#9'TCheckBox'#24'PersistentCursorCheckBox'#22'AnchorSideLeft.Contro'
-  +'l'#7#5'Owner'#21'AnchorSideTop.Control'#7#19'KeepCursorXCheckBox'#18'Anchor'
-  +'SideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#19#3'Top'#3'#'#1#5'Wid'
-  +'th'#3#158#0#18'BorderSpacing.Left'#2#6#7'Caption'#6#24'PersistentCursorChec'
-  +'kBox'#8'OnChange'#7#30'PersistentCursorCheckBoxChange'#8'TabOrder'#2#14#0#0
-  +#242#2'"'#9'TCheckBox'#27'AlwaysVisibleCursorCheckBox'#22'AnchorSideLeft.Con'
-  +'trol'#7#5'Owner'#21'AnchorSideTop.Control'#7#24'PersistentCursorCheckBox'#18
-  +'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#19#3'Top'#3'6'#1
-  +#5'Width'#3#178#0#18'BorderSpacing.Left'#2#6#7'Caption'#6#27'AlwaysVisibleCu'
-  +'rsorCheckBox'#8'OnChange'#7'!AlwaysVisibleCursorCheckBoxChange'#8'TabOrder'
-  +#2#15#0#0#242#2'#'#9'TCheckBox'#28'CursorSkipsSelectionCheckBox'#22'AnchorSi'
+  +#21'IndentsTabsGroupLabel'#18'AnchorSideTop.Side'#7#9'asrCenter'#23'AnchorSi'
+  +'deRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'
+  +#3#254#0#6'Height'#2#3#3'Top'#3#156#0#5'Width'#3#218#0#7'Anchors'#11#5'akTop'
+  +#6'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#2#10#0#0#242#2#9#6'TLabel'#16
+  +'CursorGroupLabel'#22'AnchorSideLeft.Control'#7#7'Bevel5a'#19'AnchorSideLeft'
+  +'.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#23'BlockIndentTypeComboBo'
+  +'x'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2'F'#6'Height'#2#18#3'Top'
+  +#3' '#1#5'Width'#3#134#0#18'BorderSpacing.Left'#2#10#17'BorderSpacing.Top'#2
+  +#6#7'Caption'#6#16'CursorGroupLabel'#10'Font.Style'#11#6'fsBold'#0#11'Parent'
+  +'Color'#8#10'ParentFont'#8#0#0#242#2#10#6'TBevel'#6'Bevel5'#22'AnchorSideLef'
+  +'t.Control'#7#16'CursorGroupLabel'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21
+  +'AnchorSideTop.Control'#7#16'CursorGroupLabel'#18'AnchorSideTop.Side'#7#9'as'
+  +'rCenter'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9
+  +'asrBottom'#4'Left'#3#214#0#6'Height'#2#3#3'Top'#3'('#1#5'Width'#3#2#1#7'Anc'
+  +'hors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#2#10#0#0#242
+  +#2#11#6'TLabel'#20'BlockIndentTypeLabel'#22'AnchorSideLeft.Control'#7#23'Blo'
+  +'ckIndentTypeComboBox'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideT'
+  +'op.Control'#7#23'BlockIndentTypeComboBox'#18'AnchorSideTop.Side'#7#9'asrCen'
+  ,'ter'#4'Left'#2'p'#6'Height'#2#18#3'Top'#3#1#1#5'Width'#3#137#0#20'BorderSpa'
+  +'cing.Around'#2#6#7'Caption'#6#20'BlockIndentTypeLabel'#11'ParentColor'#8#0#0
+  +#242#2#12#6'TBevel'#7'Bevel1a'#22'AnchorSideLeft.Control'#7#5'Owner'#21'Anch'
+  +'orSideTop.Control'#7#14'UndoGroupLabel'#18'AnchorSideTop.Side'#7#9'asrCente'
+  +'r'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrB'
+  +'ottom'#4'Left'#2#0#6'Height'#2#3#3'Top'#2#8#5'Width'#2'<'#0#0#242#2#13#6'TB'
+  +'evel'#7'Bevel2a'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Con'
+  +'trol'#7#16'ScrollGroupLabel'#18'AnchorSideTop.Side'#7#9'asrCenter'#23'Ancho'
+  +'rSideRight.Control'#7#7'Bevel1a'#20'AnchorSideRight.Side'#7#9'asrBottom'#4
+  +'Left'#2#0#6'Height'#2#3#3'Top'#2'R'#5'Width'#2'<'#7'Anchors'#11#5'akTop'#6
+  +'akLeft'#7'akRight'#0#0#0#242#2#14#6'TBevel'#7'Bevel3a'#22'AnchorSideLeft.Co'
+  +'ntrol'#7#5'Owner'#21'AnchorSideTop.Control'#7#21'IndentsTabsGroupLabel'#18
+  +'AnchorSideTop.Side'#7#9'asrCenter'#23'AnchorSideRight.Control'#7#7'Bevel1a'
+  +#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#2#3#3'Top'#3
+  +#156#0#5'Width'#2'<'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#0#0#242#2
+  +#15#6'TBevel'#7'Bevel5a'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSide'
+  +'Top.Control'#7#16'CursorGroupLabel'#18'AnchorSideTop.Side'#7#9'asrCenter'#23
+  +'AnchorSideRight.Control'#7#7'Bevel1a'#20'AnchorSideRight.Side'#7#9'asrBotto'
+  +'m'#4'Left'#2#0#6'Height'#2#3#3'Top'#3'('#1#5'Width'#2'<'#7'Anchors'#11#5'ak'
+  +'Top'#6'akLeft'#7'akRight'#0#0#0#242#2#16#6'TBevel'#7'Bevel6a'#22'AnchorSide'
+  +'Left.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#15'BlockGroupLabel'#18
+  +'AnchorSideTop.Side'#7#9'asrCenter'#23'AnchorSideRight.Control'#7#7'Bevel1a'
+  +#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#2#3#3'Top'#3
+  +#158#1#5'Width'#2'<'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#0#0#242#2
+  +#17#6'TLabel'#15'BlockGroupLabel'#22'AnchorSideLeft.Control'#7#7'Bevel5a'#19
+  +'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#25'ScrollPa'
+  +'stEndLineCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2'F'#6'Hei'
+  +'ght'#2#18#3'Top'#3#150#1#5'Width'#2'~'#18'BorderSpacing.Left'#2#10#17'Borde'
+  +'rSpacing.Top'#2#6#7'Caption'#6#15'BlockGroupLabel'#10'Font.Style'#11#6'fsBo'
+  +'ld'#0#11'ParentColor'#8#10'ParentFont'#8#0#0#242#2#18#6'TBevel'#6'Bevel6'#22
+  +'AnchorSideLeft.Control'#7#15'BlockGroupLabel'#19'AnchorSideLeft.Side'#7#9'a'
+  +'srBottom'#21'AnchorSideTop.Control'#7#15'BlockGroupLabel'#18'AnchorSideTop.'
+  +'Side'#7#9'asrCenter'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRi'
+  +'ght.Side'#7#9'asrBottom'#4'Left'#3#206#0#6'Height'#2#3#3'Top'#3#158#1#5'Wid'
+  +'th'#3#10#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpacing.L'
+  +'eft'#2#10#0#0#242#2#19#9'TComboBox'#19'BlockIndentComboBox'#22'AnchorSideLe'
+  +'ft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#23'TabIndentBlocksCheckB'
+  +'ox'#18'AnchorSideTop.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#17
+  +'TabWidthsComboBox'#4'Left'#2#6#6'Height'#2#29#3'Top'#3#219#0#5'Width'#2'd'
+  +#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#3#10'ItemHeight'#2#0#13
+  +'Items.Strings'#1#6#1'1'#6#1'2'#6#1'4'#6#1'8'#0#8'OnChange'#7#16'ComboboxOnC'
+  +'hange'#6'OnExit'#7#14'ComboBoxOnExit'#9'OnKeyDown'#7#17'ComboboxOnKeyDown'#8
+  +'TabOrder'#2#0#0#0#242#2#20#9'TComboBox'#17'TabWidthsComboBox'#22'AnchorSide'
+  +'Left.Control'#7#17'SmartTabsCheckBox'#21'AnchorSideTop.Control'#7#19'BlockI'
+  +'ndentComboBox'#24'AnchorSideBottom.Control'#7#5'Owner'#21'AnchorSideBottom.'
+  +'Side'#7#9'asrBottom'#4'Left'#3#236#0#6'Height'#2#29#3'Top'#3#219#0#5'Width'
+  +#2'd'#10'ItemHeight'#2#0#13'Items.Strings'#1#6#1'1'#6#1'2'#6#1'4'#6#1'8'#0#8
+  +'OnChange'#7#16'ComboboxOnChange'#6'OnExit'#7#14'ComboBoxOnExit'#9'OnKeyDown'
+  +#7#17'ComboboxOnKeyDown'#8'TabOrder'#2#1#0#0#242#2#21#9'TComboBox'#17'UndoLi'
+  +'mitComboBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'
+  +#7#14'UndoGroupLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#3#236#0#6
+  +'Height'#2#29#3'Top'#2#24#5'Width'#2'd'#18'BorderSpacing.Left'#3#230#0#20'Bo'
+  +'rderSpacing.Around'#2#6#10'ItemHeight'#2#0#13'Items.Strings'#1#6#5'32767'#6
+  +#4'4096'#6#3'512'#0#8'OnChange'#7#16'ComboboxOnChange'#6'OnExit'#7#14'ComboB'
+  +'oxOnExit'#9'OnKeyDown'#7#17'ComboboxOnKeyDown'#8'TabOrder'#2#2#0#0#242#2#22
+  +#9'TCheckBox'#17'GroupUndoCheckBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21
+  +'AnchorSideTop.Control'#7#21'UndoAfterSaveCheckBox'#18'AnchorSideTop.Side'#7
+  +#9'asrBottom'#4'Left'#2#6#6'Height'#2#22#3'Top'#2'.'#5'Width'#3#160#0#18'Bor'
+  +'derSpacing.Left'#2#6#7'Caption'#6#17'GroupUndoCheckBox'#8'OnChange'#7#23'Gr'
+  +'oupUndoCheckBoxChange'#8'TabOrder'#2#3#0#0#242#2#23#9'TCheckBox'#21'UndoAft'
+  +'erSaveCheckBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Cont'
+  +'rol'#7#14'UndoGroupLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6
+  +#6'Height'#2#22#3'Top'#2#24#5'Width'#3#184#0#18'BorderSpacing.Left'#2#6#17'B'
+  +'orderSpacing.Top'#2#6#7'Caption'#6#21'UndoAfterSaveCheckBox'#8'TabOrder'#2#4
+  ,#0#0#242#2#24#9'TCheckBox'#25'ScrollPastEndFileCheckBox'#22'AnchorSideLeft.C'
+  +'ontrol'#7#5'Owner'#21'AnchorSideTop.Control'#7#16'ScrollGroupLabel'#18'Anch'
+  +'orSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#22#3'Top'#2'b'#5'Wid'
+  +'th'#3#193#0#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#7'Caption'
+  +#6#25'ScrollPastEndFileCheckBox'#8'OnChange'#7#31'ScrollPastEndFileCheckBoxC'
+  +'hange'#8'TabOrder'#2#5#0#0#242#2#25#9'TCheckBox'#25'ScrollPastEndLineCheckB'
+  +'ox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#27'Al'
+  +'waysVisibleCursorCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6
+  +#6'Height'#2#22#3'Top'#3'z'#1#5'Width'#3#199#0#18'BorderSpacing.Left'#2#6#7
+  +'Caption'#6#25'ScrollPastEndLineCheckBox'#8'OnChange'#7#31'ScrollPastEndLine'
+  +'CheckBoxChange'#8'TabOrder'#2#6#0#0#242#2#26#9'TCheckBox'#23'ScrollByOneLes'
+  +'sCheckBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7
+  +#16'ScrollGroupLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#3#236#0#6
+  +'Height'#2#22#3'Top'#2'b'#5'Width'#3#193#0#18'BorderSpacing.Left'#3#230#0#20
+  +'BorderSpacing.Around'#2#6#7'Caption'#6#23'ScrollByOneLessCheckBox'#8'OnChan'
+  +'ge'#7#29'ScrollByOneLessCheckBoxChange'#8'TabOrder'#2#7#0#0#242#2#27#9'TChe'
+  +'ckBox'#22'HalfPageScrollCheckBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21
+  +'AnchorSideTop.Control'#7#25'ScrollPastEndFileCheckBox'#18'AnchorSideTop.Sid'
+  +'e'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#22#3'Top'#2'x'#5'Width'#3#178#0#18
+  +'BorderSpacing.Left'#2#6#7'Caption'#6#22'HalfPageScrollCheckBox'#8'OnChange'
+  +#7#28'HalfPageScrollCheckBoxChange'#8'TabOrder'#2#8#0#0#242#2#28#9'TCheckBox'
+  +#18'AutoIndentCheckBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideT'
+  +'op.Control'#7#21'IndentsTabsGroupLabel'#18'AnchorSideTop.Side'#7#9'asrBotto'
+  +'m'#4'Left'#2#6#6'Height'#2#22#3'Top'#3#172#0#5'Width'#3#157#0#18'BorderSpac'
+  +'ing.Left'#2#6#17'BorderSpacing.Top'#2#6#7'Caption'#6#18'AutoIndentCheckBox'
+  +#8'OnChange'#7#24'AutoIndentCheckBoxChange'#8'TabOrder'#2#9#0#0#242#2#29#9'T'
+  +'CheckBox'#23'TabIndentBlocksCheckBox'#22'AnchorSideLeft.Control'#7#5'Owner'
+  +#21'AnchorSideTop.Control'#7#18'AutoIndentCheckBox'#18'AnchorSideTop.Side'#7
+  +#9'asrBottom'#4'Left'#2#6#6'Height'#2#22#3'Top'#3#194#0#5'Width'#3#189#0#18
+  +'BorderSpacing.Left'#2#6#7'Caption'#6#23'TabIndentBlocksCheckBox'#8'OnChange'
+  +#7#29'TabIndentBlocksCheckBoxChange'#8'TabOrder'#2#10#0#0#242#2#30#9'TCheckB'
+  +'ox'#17'SmartTabsCheckBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSi'
+  +'deTop.Control'#7#21'IndentsTabsGroupLabel'#18'AnchorSideTop.Side'#7#9'asrBo'
+  +'ttom'#4'Left'#3#236#0#6'Height'#2#22#3'Top'#3#172#0#5'Width'#3#155#0#18'Bor'
+  +'derSpacing.Left'#3#230#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#17'Smart'
+  +'TabsCheckBox'#8'OnChange'#7#23'SmartTabsCheckBoxChange'#8'TabOrder'#2#11#0#0
+  +#242#2#31#9'TCheckBox'#20'TabsToSpacesCheckBox'#22'AnchorSideLeft.Control'#7
+  +#17'SmartTabsCheckBox'#21'AnchorSideTop.Control'#7#23'TabIndentBlocksCheckBo'
+  +'x'#4'Left'#3#236#0#6'Height'#2#22#3'Top'#3#194#0#5'Width'#3#175#0#7'Caption'
+  +#6#20'TabsToSpacesCheckBox'#8'OnChange'#7#26'TabsToSpacesCheckBoxChange'#8'T'
+  +'abOrder'#2#12#0#0#242#2' '#9'TCheckBox'#19'KeepCursorXCheckBox'#22'AnchorSi'
   +'deLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#16'CursorGroupLabel'
-  +#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#3#236#0#6'Height'#2#19#3'Top'
-  +#3#16#1#5'Width'#3#182#0#18'BorderSpacing.Left'#3#230#0#20'BorderSpacing.Aro'
-  +'und'#2#6#7'Caption'#6#28'CursorSkipsSelectionCheckBox'#8'OnChange'#7'"Curso'
-  +'rSkipsSelectionCheckBoxChange'#8'TabOrder'#2#16#0#0#242#2'$'#9'TCheckBox"Ho'
-  +'meKeyJumpsToNearestStartCheckBox'#22'AnchorSideLeft.Control'#7#28'CursorSki'
-  +'psSelectionCheckBox'#21'AnchorSideTop.Control'#7#27'AlwaysVisibleCursorChec'
-  +'kBox'#4'Left'#3#236#0#6'Height'#2#19#3'Top'#3'6'#1#5'Width'#3#236#0#7'Capti'
-  ,'on'#6'"HomeKeyJumpsToNearestStartCheckBox'#8'OnChange'#7'(HomeKeyJumpsToNea'
-  +'restStartCheckBoxChange'#8'TabOrder'#2#17#0#0#242#2'%'#9'TCheckBox!EndKeyJu'
-  +'mpsToNearestStartCheckBox'#22'AnchorSideLeft.Control'#7'"HomeKeyJumpsToNear'
-  +'estStartCheckBox'#21'AnchorSideTop.Control'#7#25'ScrollPastEndLineCheckBox'
-  +#4'Left'#3#236#0#6'Height'#2#19#3'Top'#3'I'#1#5'Width'#3#223#0#7'Caption'#6
-  +'!EndKeyJumpsToNearestStartCheckBox'#8'OnChange'#7'''EndKeyJumpsToNearestSta'
-  +'rtCheckBoxChange'#8'TabOrder'#2#18#0#0#242#2'&'#9'TComboBox'#23'BlockIndent'
-  +'TypeComboBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Contro'
-  +'l'#7#19'BlockIndentComboBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#24'Ancho'
-  +'rSideBottom.Control'#7#17'TabWidthsComboBox'#4'Left'#2#6#6'Height'#2#23#3'T'
-  +'op'#3#221#0#5'Width'#2'd'#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2
-  +#3#10'ItemHeight'#2#15#9'ItemWidth'#3#200#0#8'OnChange'#7#16'ComboboxOnChang'
-  +'e'#6'OnExit'#7#14'ComboBoxOnExit'#9'OnKeyDown'#7#17'ComboboxOnKeyDown'#5'St'
-  +'yle'#7#14'csDropDownList'#8'TabOrder'#2#19#0#0#242#2''''#9'TCheckBox'#23'Pe'
-  +'rsistentBlockCheckBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideT'
-  +'op.Control'#7#15'BlockGroupLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'L'
-  +'eft'#2#6#6'Height'#2#19#3'Top'#3'x'#1#5'Width'#3#152#0#18'BorderSpacing.Lef'
-  +'t'#2#6#17'BorderSpacing.Top'#2#6#7'Caption'#6#23'PersistentBlockCheckBox'#8
-  +'OnChange'#7#29'PersistentBlockCheckBoxChange'#8'TabOrder'#2#20#0#0#242#2'('
-  +#9'TCheckBox'#22'OverwriteBlockCheckBox'#22'AnchorSideLeft.Control'#7#5'Owne'
-  +'r'#21'AnchorSideTop.Control'#7#15'BlockGroupLabel'#18'AnchorSideTop.Side'#7
-  +#9'asrBottom'#4'Left'#3#236#0#6'Height'#2#19#3'Top'#3'x'#1#5'Width'#3#152#0
-  +#18'BorderSpacing.Left'#3#230#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#22
-  +'OverwriteBlockCheckBox'#8'OnChange'#7#28'OverwriteBlockCheckBoxChange'#8'Ta'
-  +'bOrder'#2#21#0#0#242#2')'#9'TCheckBox'#22'CursorSkipsTabCheckBox'#22'Anchor'
-  +'SideLeft.Control'#7#28'CursorSkipsSelectionCheckBox'#21'AnchorSideTop.Contr'
-  +'ol'#7#24'PersistentCursorCheckBox'#4'Left'#3#236#0#6'Height'#2#19#3'Top'#3
-  +'#'#1#5'Width'#3#154#0#7'Caption'#6#22'CursorSkipsTabCheckBox'#8'OnChange'#7
-  +#28'CursorSkipsTabCheckBoxChange'#8'TabOrder'#2#22#0#0#0
+  +#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#22#3'Top'#3'8'
+  +#1#5'Width'#3#167#0#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#7'C'
+  +'aption'#6#19'KeepCursorXCheckBox'#8'OnChange'#7#25'KeepCursorXCheckBoxChang'
+  +'e'#8'TabOrder'#2#13#0#0#242#2'!'#9'TCheckBox'#24'PersistentCursorCheckBox'
+  +#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#19'KeepCu'
+  +'rsorXCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2
+  +#22#3'Top'#3'N'#1#5'Width'#3#193#0#18'BorderSpacing.Left'#2#6#7'Caption'#6#24
+  +'PersistentCursorCheckBox'#8'OnChange'#7#30'PersistentCursorCheckBoxChange'#8
+  +'TabOrder'#2#14#0#0#242#2'"'#9'TCheckBox'#27'AlwaysVisibleCursorCheckBox'#22
+  +'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#24'Persisten'
+  +'tCursorCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'
+  +#2#22#3'Top'#3'd'#1#5'Width'#3#213#0#18'BorderSpacing.Left'#2#6#7'Caption'#6
+  +#27'AlwaysVisibleCursorCheckBox'#8'OnChange'#7'!AlwaysVisibleCursorCheckBoxC'
+  +'hange'#8'TabOrder'#2#15#0#0#242#2'#'#9'TCheckBox'#28'CursorSkipsSelectionCh'
+  +'eckBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#16
+  +'CursorGroupLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#3#236#0#6'H'
+  +'eight'#2#22#3'Top'#3'8'#1#5'Width'#3#222#0#18'BorderSpacing.Left'#3#230#0#20
+  +'BorderSpacing.Around'#2#6#7'Caption'#6#28'CursorSkipsSelectionCheckBox'#8'O'
+  +'nChange'#7'"CursorSkipsSelectionCheckBoxChange'#8'TabOrder'#2#16#0#0#242#2
+  +'$'#9'TCheckBox"HomeKeyJumpsToNearestStartCheckBox'#22'AnchorSideLeft.Contro'
+  +'l'#7#28'CursorSkipsSelectionCheckBox'#21'AnchorSideTop.Control'#7#27'Always'
+  +'VisibleCursorCheckBox'#4'Left'#3#236#0#6'Height'#2#22#3'Top'#3'd'#1#5'Width'
+  ,#3#27#1#7'Caption'#6'"HomeKeyJumpsToNearestStartCheckBox'#8'OnChange'#7'(Hom'
+  +'eKeyJumpsToNearestStartCheckBoxChange'#8'TabOrder'#2#17#0#0#242#2'%'#9'TChe'
+  +'ckBox!EndKeyJumpsToNearestStartCheckBox'#22'AnchorSideLeft.Control'#7'"Home'
+  +'KeyJumpsToNearestStartCheckBox'#21'AnchorSideTop.Control'#7#25'ScrollPastEn'
+  +'dLineCheckBox'#4'Left'#3#236#0#6'Height'#2#22#3'Top'#3'z'#1#5'Width'#3#12#1
+  +#7'Caption'#6'!EndKeyJumpsToNearestStartCheckBox'#8'OnChange'#7'''EndKeyJump'
+  +'sToNearestStartCheckBoxChange'#8'TabOrder'#2#18#0#0#242#2'&'#9'TComboBox'#23
+  +'BlockIndentTypeComboBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSid'
+  +'eTop.Control'#7#19'BlockIndentComboBox'#18'AnchorSideTop.Side'#7#9'asrBotto'
+  +'m'#24'AnchorSideBottom.Control'#7#17'TabWidthsComboBox'#4'Left'#2#6#6'Heigh'
+  +'t'#2#31#3'Top'#3#251#0#5'Width'#2'd'#18'BorderSpacing.Left'#2#6#17'BorderSp'
+  +'acing.Top'#2#3#10'ItemHeight'#2#0#9'ItemWidth'#3#200#0#8'OnChange'#7#16'Com'
+  +'boboxOnChange'#6'OnExit'#7#14'ComboBoxOnExit'#9'OnKeyDown'#7#17'ComboboxOnK'
+  +'eyDown'#5'Style'#7#14'csDropDownList'#8'TabOrder'#2#19#0#0#242#2''''#9'TChe'
+  +'ckBox'#23'PersistentBlockCheckBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21
+  +'AnchorSideTop.Control'#7#15'BlockGroupLabel'#18'AnchorSideTop.Side'#7#9'asr'
+  +'Bottom'#4'Left'#2#6#6'Height'#2#22#3'Top'#3#174#1#5'Width'#3#185#0#18'Borde'
+  +'rSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#7'Caption'#6#23'PersistentBloc'
+  +'kCheckBox'#8'OnChange'#7#29'PersistentBlockCheckBoxChange'#8'TabOrder'#2#20
+  +#0#0#242#2'('#9'TCheckBox'#22'OverwriteBlockCheckBox'#22'AnchorSideLeft.Cont'
+  +'rol'#7#5'Owner'#21'AnchorSideTop.Control'#7#15'BlockGroupLabel'#18'AnchorSi'
+  +'deTop.Side'#7#9'asrBottom'#4'Left'#3#236#0#6'Height'#2#22#3'Top'#3#174#1#5
+  +'Width'#3#181#0#18'BorderSpacing.Left'#3#230#0#20'BorderSpacing.Around'#2#6#7
+  +'Caption'#6#22'OverwriteBlockCheckBox'#8'OnChange'#7#28'OverwriteBlockCheckB'
+  +'oxChange'#8'TabOrder'#2#21#0#0#242#2')'#9'TCheckBox'#22'CursorSkipsTabCheck'
+  +'Box'#22'AnchorSideLeft.Control'#7#28'CursorSkipsSelectionCheckBox'#21'Ancho'
+  +'rSideTop.Control'#7#24'PersistentCursorCheckBox'#4'Left'#3#236#0#6'Height'#2
+  +#22#3'Top'#3'N'#1#5'Width'#3#184#0#7'Caption'#6#22'CursorSkipsTabCheckBox'#8
+  +'OnChange'#7#28'CursorSkipsTabCheckBoxChange'#8'TabOrder'#2#22#0#0#0
 ]);
diff --git a/ide/lazarusidestrconsts.pas b/ide/lazarusidestrconsts.pas
index cc863b4211..ab75b9f01a 100644
--- a/ide/lazarusidestrconsts.pas
+++ b/ide/lazarusidestrconsts.pas
@@ -4499,6 +4499,10 @@ resourcestring
     +'must be unique in all components on the form/datamodule.The name is '
     +'compared case insensitive like a normal pascal identifier.';
   lisAskForFileNameOnNewFile = 'Ask for file name on new file';
+  lisIndentation = 'Indentation';
+  lisExampleFile = 'Example file:';
+  lisChooseAPascalFileForIndentationExamples = 'Choose a pascal file for '
+    +'indentation examples';
 
 implementation