From da890afec316bda2078c8ddca1f77b790c26213b Mon Sep 17 00:00:00 2001
From: Basile Burg <basile.b@gmx.com>
Date: Thu, 15 Mar 2018 19:58:48 +0100
Subject: [PATCH] fix #271 - Creative font visualisations in merge window

---
 src/ce_diff.pas    | 7 +++++--
 src/ce_synmemo.pas | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/ce_diff.pas b/src/ce_diff.pas
index 13bd72d8..4d768ee7 100644
--- a/src/ce_diff.pas
+++ b/src/ce_diff.pas
@@ -21,13 +21,13 @@ type
     Panel2: TPanel;
   private
   public
-    constructor construct(const fname1, fname2: string);
+    constructor construct(ed: TSynEdit; const fname1, fname2: string);
   end;
 
 implementation
 {$R *.lfm}
 
-constructor TCEDiffViewer.construct(const fname1, fname2: string);
+constructor TCEDiffViewer.construct(ed: TSynEdit; const fname1, fname2: string);
 var
   p: TProcess;
   r: TStringList;
@@ -36,6 +36,9 @@ begin
 
   editor.Gutter.LineNumberPart.Visible:=false;
 
+  if ed.isNotNil then
+    editor.Font.Assign(ed.Font);
+
   p := TProcess.Create(self);
   try
     p.Executable:= 'diff' + exeExt;
diff --git a/src/ce_synmemo.pas b/src/ce_synmemo.pas
index f1d673e3..93b088f3 100644
--- a/src/ce_synmemo.pas
+++ b/src/ce_synmemo.pas
@@ -2999,7 +2999,7 @@ begin
       begin
         lines.SaveToFile(tempFilename);
         fDiffDialogWillClose := true;
-        With TCEDiffViewer.construct(fTempFileName, fFilename) do
+        With TCEDiffViewer.construct(self, fTempFileName, fFilename) do
         try
           mr := ShowModal;
           case mr of