From 0682122b3f29c5765e8ac0b932a14a40efe312e9 Mon Sep 17 00:00:00 2001
From: Basile Burg <basile.b@gmx.com>
Date: Fri, 4 Mar 2016 06:14:46 +0100
Subject: [PATCH] removed temp code for #25 and added workaround in the default
 static macros

---
 src/ce_editoroptions.pas | 5 -----
 src/ce_staticmacro.pas   | 3 ++-
 src/ce_synmemo.pas       | 6 ------
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/ce_editoroptions.pas b/src/ce_editoroptions.pas
index 9a5861bb..5d622d38 100644
--- a/src/ce_editoroptions.pas
+++ b/src/ce_editoroptions.pas
@@ -58,7 +58,6 @@ type
     fCompletionMenuWidth: integer;
     fCompletionMenuLines: Byte;
     fAutoCLoseCurlyBrace: TBraceAutoCloseStyle;
-    fCtrlDisableAutoClose: boolean;
     //
     procedure setFont(value: TFont);
     procedure setSelCol(value: TSynSelectedColor);
@@ -84,7 +83,6 @@ type
     property completionMenuCaseCare: boolean read fCompletionMenuCaseCare write fCompletionMenuCaseCare;
     property completionMenuLines: byte read fCompletionMenuLines write setCompletionMenuLines;
     property completionMenuWidth: integer read fCompletionMenuWidth write fCompletionMenuWidth;
-    //property ctrlDisableAutoClose: boolean read fCtrlDisableAutoClose write fCtrlDisableAutoClose default true;
     property currentLine: TSynSelectedColor read fCurrLineAttribs write setCurrLineAttribs;
     property ddocDelay: Integer read fDDocDelay write setDDocDelay;
     property folding: TSynSelectedColor read fFoldedColor write setFoldedColor;
@@ -219,7 +217,6 @@ begin
   fCurrLineAttribs.Background := fBackground - $080808;
   fCurrLineAttribs.Foreground := clNone;
   //
-  fCtrlDisableAutoClose := true;
   options1 :=
     [eoAutoIndent, eoBracketHighlight, eoGroupUndo, eoTabsToSpaces, eoTrimTrailingSpaces,
     eoDragDropEditing, eoShowCtrlMouseLinks, eoEnhanceHomeKey, eoTabIndent];
@@ -266,7 +263,6 @@ begin
   begin
     srcopt := TCEEditorOptionsBase(src);
     //
-    fCtrlDisableAutoClose:=srcopt.fCtrlDisableAutoClose;
     fResetFontSize:=srcopt.fResetFontSize;
     fAutoCLoseCurlyBrace := srcopt.fAutoCLoseCurlyBrace;
     fCompletionMenuWidth:=srcopt.fCompletionMenuWidth;
@@ -612,7 +608,6 @@ begin
   if not fResetFontSize then
     anEditor.Font.Size := savedSize;
 
-  anEditor.ctrlDisableAutoClose           := fCtrlDisableAutoClose;
   anEditor.autoCloseCurlyBrace            := fAutoCLoseCurlyBrace;
   anEditor.completionMenu.TheForm.Width   := fCompletionMenuWidth;
   anEditor.completionMenu.LinesInWindow   := fCompletionMenuLines;
diff --git a/src/ce_staticmacro.pas b/src/ce_staticmacro.pas
index 620384f7..eaf398b6 100644
--- a/src/ce_staticmacro.pas
+++ b/src/ce_staticmacro.pas
@@ -98,8 +98,9 @@ uses
 const
   OptFname = 'staticmacros.txt';
 
-  defMacros: array[0..14] of string = (
+  defMacros: array[0..15] of string = (
     '$a=auto',
+    '$b={}',
     '$c=class {}',
     '$e=enum {}',
     '$it=interface {}',
diff --git a/src/ce_synmemo.pas b/src/ce_synmemo.pas
index f99f36dc..c403ca54 100644
--- a/src/ce_synmemo.pas
+++ b/src/ce_synmemo.pas
@@ -140,8 +140,6 @@ type
     fOverrideColMode: boolean;
     fAutoCloseCurlyBrace: TBraceAutoCloseStyle;
     fLexToks: TLexTokenList;
-    fCtrlDisableAutoClose: boolean;
-    fShiftState: TShiftState;
     procedure setMatchOpts(value: TIdentifierMatchOptions);
     function getMouseFileBytePos: Integer;
     procedure changeNotify(Sender: TObject);
@@ -225,7 +223,6 @@ type
     property ddocDelay: Integer read fDDocDelay write setDDocDelay;
     property autoDotDelay: Integer read fAutoDotDelay write setAutoDotDelay;
     property autoCloseCurlyBrace: TBraceAutoCloseStyle read fAutoCloseCurlyBrace write fAutoCloseCurlyBrace;
-    property ctrlDisableAutoClose: boolean read fCtrlDisableAutoClose write fCtrlDisableAutoClose;
   end;
 
   procedure SetDefaultCoeditKeystrokes(ed: TSynEdit);
@@ -1392,7 +1389,6 @@ end;
 procedure TCESynMemo.KeyDown(var Key: Word; Shift: TShiftState);
 begin
   inherited;
-  //fShiftState := Shift;
   highlightCurrentIdentifier;
   if fCompletion.IsActive then
       fCompletion.CurrentString:= GetWordAtRowCol(LogicalCaretXY);
@@ -1449,8 +1445,6 @@ begin
           showCallTips(fCallTipStrings.Text);
       end;
     '{':
-        //if (not fCtrlDisableAutoClose) or
-        //  (fCtrlDisableAutoClose and (not (ssCtrl in fShiftState))) then
         case fAutoCloseCurlyBrace of
           autoCloseAlways:
             curlyBraceCloseAndIndent(self);