From 804dff87d1f0a54bf50b43f4925eca8903bdc4e0 Mon Sep 17 00:00:00 2001
From: Basile Burg <basile.burg@gmx.com>
Date: Mon, 16 Feb 2015 02:42:28 +0100
Subject: [PATCH 1/3] fix, DCD get doc only called for D sources

---
 src/ce_main.pas | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ce_main.pas b/src/ce_main.pas
index c80b9324..51518985 100644
--- a/src/ce_main.pas
+++ b/src/ce_main.pas
@@ -854,7 +854,7 @@ procedure TCEMainForm.ApplicationProperties1ShowHint(var HintStr: string;
 begin
   // TODO-crefactor: move this to TCESynMemo or TCEEditorWidget.
   // TODO-cbugfix: first DDoc hint, window rect is wrong.
-  if fDoc <> nil then if fDoc.Focused then
+  if (fDoc <> nil) and fDoc.Focused and fDoc.isDSource then
   begin
     TCEEditorHintWindow.FontSize := fDoc.Font.Size;
     HintInfo.HintWindowClass := TCEEditorHintWindow;

From e6188127402a0d4feef177130d213b30c2b89e3d Mon Sep 17 00:00:00 2001
From: Basile Burg <basile.burg@gmx.com>
Date: Mon, 16 Feb 2015 02:54:44 +0100
Subject: [PATCH 2/3] fix, exclusions were not copied when cloning a config

---
 src/ce_dmdwrap.pas | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/ce_dmdwrap.pas b/src/ce_dmdwrap.pas
index 79b32098..5300fd12 100644
--- a/src/ce_dmdwrap.pas
+++ b/src/ce_dmdwrap.pas
@@ -879,6 +879,7 @@ begin
     fImpt.Assign(src.fImpt);
     fFName := patchPlateformPath(src.fFname);
     fObjDir := patchPlateformPath(src.fObjDir);
+    fExcl.Assign(src.fExcl);
   end
   else inherited;
 end;

From 302a7586122b40a2573fb3dbdfb4b12c7b321b93 Mon Sep 17 00:00:00 2001
From: Basile Burg <basile.burg@gmx.com>
Date: Mon, 16 Feb 2015 02:56:40 +0100
Subject: [PATCH 3/3] renamed ambiguous fields

---
 src/ce_dmdwrap.pas | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/ce_dmdwrap.pas b/src/ce_dmdwrap.pas
index 5300fd12..89434853 100644
--- a/src/ce_dmdwrap.pas
+++ b/src/ce_dmdwrap.pas
@@ -207,8 +207,8 @@ type
   TPathsOpts = class(TOptsGroup)
   private
     fExtraSrcs: TStringList;
-    fIncl: TStringList;
-    fImpt: TStringList;
+    fImpMod: TStringList;
+    fImpStr: TStringList;
     fExcl: TStringList;
     fFname: TCEFilename;
     fObjDir: TCEPathname;
@@ -225,10 +225,10 @@ type
     property Sources: TStringList read fExtraSrcs write setSrcs stored false; deprecated;
     property exclusions: TStringList read fExcl write setExcl;
     property extraSources: TStringList read fExtraSrcs write setSrcs;
-    property includes: TStringList read fIncl write setIncl stored false; deprecated;
-    property imports: TStringList read fImpt write setImpt stored false; deprecated;
-    property importModulePaths: TStringList read fIncl write setIncl;
-    property importStringPaths: TStringList read fImpt write setImpt;
+    property includes: TStringList read fImpMod write setIncl stored false; deprecated;
+    property imports: TStringList read fImpStr write setImpt stored false; deprecated;
+    property importModulePaths: TStringList read fImpMod write setIncl;
+    property importStringPaths: TStringList read fImpStr write setImpt;
   public
     constructor create;
     destructor destroy; override;
@@ -829,14 +829,14 @@ end;
 constructor TPathsOpts.create;
 begin
   fExtraSrcs := TStringList.Create;
-  fIncl := TStringList.Create;
-  fImpt := TStringList.Create;
+  fImpMod := TStringList.Create;
+  fImpStr := TStringList.Create;
   fExcl := TStringList.Create;
   // setSrcs(), setIncl(), etc are not called when reloading from
   // a stream but rather the TSgringList.Assign()
   fExtraSrcs.OnChange := @strLstChange;
-  fIncl.OnChange := @strLstChange;
-  fImpt.OnChange := @strLstChange;
+  fImpMod.OnChange := @strLstChange;
+  fImpStr.OnChange := @strLstChange;
   fExcl.OnChange := @strLstChange;
 end;
 
@@ -857,9 +857,9 @@ begin
     if not listAsteriskPath(str, aList, dExtList) then
       aList.Add(str);
   end;
-  for str in fIncl do
+  for str in fImpMod do
     aList.Add('-I'+ symbolExpander.get(str));
-  for str in fImpt do
+  for str in fImpStr do
     aList.Add('-J'+ symbolExpander.get(str));
   if fFname <> '' then
     aList.Add('-of' + symbolExpander.get(fFname));
@@ -875,8 +875,8 @@ begin
   begin
     src := TPathsOpts(aValue);
     fExtraSrcs.Assign(src.fExtraSrcs);
-    fIncl.Assign(src.fIncl);
-    fImpt.Assign(src.fImpt);
+    fImpMod.Assign(src.fImpMod);
+    fImpStr.Assign(src.fImpStr);
     fFName := patchPlateformPath(src.fFname);
     fObjDir := patchPlateformPath(src.fObjDir);
     fExcl.Assign(src.fExcl);
@@ -887,8 +887,8 @@ end;
 destructor TPathsOpts.destroy;
 begin
   fExtraSrcs.free;
-  fIncl.free;
-  fImpt.free;
+  fImpMod.free;
+  fImpStr.free;
   fExcl.free;
   inherited;
 end;
@@ -917,15 +917,15 @@ end;
 
 procedure TPathsOpts.setIncl(aValue: TStringList);
 begin
-  fIncl.Assign(aValue);
-  patchPlateformPaths(fIncl);
+  fImpMod.Assign(aValue);
+  patchPlateformPaths(fImpMod);
   doChanged;
 end;
 
 procedure TPathsOpts.setImpt(aValue: TStringList);
 begin
-  fImpt.Assign(aValue);
-  patchPlateformPaths(fImpt);
+  fImpStr.Assign(aValue);
+  patchPlateformPaths(fImpStr);
   doChanged;
 end;