From 467d7abeb1aa56d698010da039dd12c560a76e9e Mon Sep 17 00:00:00 2001
From: Basile Burg <basile.b@gmx.com>
Date: Wed, 3 Feb 2016 15:51:00 +0100
Subject: [PATCH] fix, auto brace closing indent error when option eoAutoIdent
 was set

---
 src/ce_editoroptions.pas |  2 +-
 src/ce_synmemo.pas       | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/ce_editoroptions.pas b/src/ce_editoroptions.pas
index 005f76b9..69d15cc4 100644
--- a/src/ce_editoroptions.pas
+++ b/src/ce_editoroptions.pas
@@ -214,7 +214,7 @@ begin
   fCurrLineAttribs.Foreground := clNone;
   //
   options1 :=
-    [eoAutoIndent, eoBracketHighlight, eoGroupUndo, eoTabsToSpaces,
+    [eoAutoIndent, eoBracketHighlight, eoGroupUndo, eoTabsToSpaces, eoTrimTrailingSpaces,
     eoDragDropEditing, eoShowCtrlMouseLinks, eoEnhanceHomeKey, eoTabIndent];
   options2 :=
     [eoEnhanceEndKey, eoFoldedCopyPaste, eoOverwriteBlock];
diff --git a/src/ce_synmemo.pas b/src/ce_synmemo.pas
index fef54c17..bb97efea 100644
--- a/src/ce_synmemo.pas
+++ b/src/ce_synmemo.pas
@@ -790,11 +790,13 @@ begin
   editor.CommandProcessor(ecDown, '', nil);
   editor.CommandProcessor(ecInsertLine, '', nil);
   editor.CommandProcessor(ecDown, '', nil);
-  for j := 1 to i do editor.CommandProcessor(ecChar, beg[j], nil);
+  if not (eoAutoIndent in editor.Options) then
+    for j := 1 to i do editor.CommandProcessor(ecChar, beg[j], nil);
   editor.CommandProcessor(ecChar, '}', nil);
   editor.CommandProcessor(ecUp, '', nil);
   for j := 1 to i do editor.CommandProcessor(ecChar, beg[j], nil);
-  editor.CommandProcessor(ecTab, '', nil);
+  if not (eoAutoIndent in editor.Options) then
+    editor.CommandProcessor(ecTab, '', nil);
   editor.EndUndoBlock;
 end;
 
@@ -1533,7 +1535,7 @@ function TCESynMemo.BreakPointLine(index: integer): integer;
 begin
   if index >= fBreakPoints.Count then
     exit(0);
-  {$PUSH}{$WARNINGS OFF}
+  {$PUSH}{$WARNINGS OFF}{$HINTS OFF}
   exit(Integer(fBreakPoints.Items[index]));
   {$POP}
 end;
@@ -1550,7 +1552,7 @@ begin
   m.ImageIndex := 0;
   m.Visible := true;
   Marks.Add(m);
-  {$PUSH}{$WARNINGS OFF}
+  {$PUSH}{$WARNINGS OFF}{$HINTS OFF}
   fBreakPoints.Add(pointer(line));
   {$POP}
   if assigned(fBreakpointEvent) then
@@ -1563,7 +1565,7 @@ begin
     exit;
   if marks.Line[line].isNotNil and (marks.Line[line].Count > 0) then
     marks.Line[line].Clear(true);
-  {$PUSH}{$WARNINGS OFF}
+  {$PUSH}{$WARNINGS OFF}{$HINTS OFF}
   fBreakPoints.Remove(pointer(line));
   {$POP}
   if assigned(fBreakpointEvent) then
@@ -1572,7 +1574,7 @@ end;
 
 function TCESynMemo.findBreakPoint(line: integer): boolean;
 begin
-  {$PUSH}{$WARNINGS OFF}
+  {$PUSH}{$WARNINGS OFF}{$HINTS OFF}
   exit(fBreakPoints.IndexOf(pointer(line)) <> -1);
   {$POP}
 end;