From 01a9fd311ba14ce51bb8bce1cf56944aaec4a009 Mon Sep 17 00:00:00 2001
From: ondrej <ondrej@lazarus-ide.org>
Date: Mon, 25 Jan 2016 12:47:53 +0000
Subject: [PATCH] IDE: use AppendPathDelim instead of
 IncludeTrailingPathDelimiter for config paths.

git-svn-id: trunk@51404 -
---
 ide/ideprotocol.pas  | 7 ++++---
 ide/inputhistory.pas | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ide/ideprotocol.pas b/ide/ideprotocol.pas
index dc9a2bacfc..abb9ce51e0 100644
--- a/ide/ideprotocol.pas
+++ b/ide/ideprotocol.pas
@@ -32,7 +32,8 @@ unit IDEProtocol;
 interface
 
 uses
-  Classes, SysUtils, LCLProc, LazConf, BaseIDEIntf, LazConfigStorage;
+  Classes, SysUtils, LCLProc, LazConf, BaseIDEIntf, LazConfigStorage,
+  LazFileUtils;
   
 const
   IDEProtocolOptsVersion: integer = 1;
@@ -80,7 +81,7 @@ var
   Config: TConfigStorage;
 begin
   if Filename='' then
-    Filename:=IncludeTrailingPathDelimiter(GetPrimaryConfigPath)+IDEProtocolFilename;
+    Filename:=AppendPathDelim(GetPrimaryConfigPath)+IDEProtocolFilename;
   try
     Config:=DefaultConfigClass.Create(Filename,true);
     try
@@ -100,7 +101,7 @@ var
   Config: TConfigStorage;
 begin
   if Filename='' then
-    Filename:=IncludeTrailingPathDelimiter(GetPrimaryConfigPath)+IDEProtocolFilename;
+    Filename:=AppendPathDelim(GetPrimaryConfigPath)+IDEProtocolFilename;
   try
     Config:=DefaultConfigClass.Create(Filename,false);
     try
diff --git a/ide/inputhistory.pas b/ide/inputhistory.pas
index 4f233abf3e..85c8e7ac2b 100644
--- a/ide/inputhistory.pas
+++ b/ide/inputhistory.pas
@@ -38,7 +38,7 @@ interface
 uses
   Classes, SysUtils, FileProcs, LazFileCache, DiffPatch, IDEProcs,
   AvgLvlTree, Laz2_XMLCfg, SynEditTypes, LazConf, Dialogs, LazUTF8, IDEDialogs,
-  ProjectIntf;
+  ProjectIntf, LazFileUtils;
 
 {$ifdef Windows}
 {$define CaseInsensitiveFilenames}
@@ -577,7 +577,7 @@ procedure TInputHistories.SetLazarusDefaultFilename;
 var
   ConfFileName: string;
 begin
-  ConfFileName:=IncludeTrailingPathDelimiter(GetPrimaryConfigPath)+DefaultHistoryFile;
+  ConfFileName:=AppendPathDelim(GetPrimaryConfigPath)+DefaultHistoryFile;
   CopySecondaryConfigFile(DefaultHistoryFile);
   FFilename:=ConfFilename;
 end;