paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-10-01 10:49:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

undo

Browse Source 
git-svn-id: trunk@36315 -
This commit is contained in:
mattias 2012-03-25 15:34:46 +00:00
parent 3525373a8a
commit 074286aea3
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ide/compileroptions.pp
View File

@ -2088,8 +2088,6 @@ var
InheritedPath: String;
ParsedBaseDir: String;
begin
// the first path is searched first
// current path
if Option<>pcosNone then begin
CurrentPath:=ParsedOpts.GetParsedValue(Option);
@ -2224,16 +2222,13 @@ begin
end;
// inherited custom options
InhCustomOptions:=GetInheritedOption(icoCustomOptions,true,Parsed);
Result:=InhCustomOptions;
// concatenate
if CurCustomOptions<>'' then
begin
if Result<>'' then
Result+=' ';
Result+=CurCustomOptions;
end;
Result:=CurCustomOptions+' '+InhCustomOptions
else
Result:=InhCustomOptions;
if Result='' then exit;
// eliminate line breaks
Result:=SpecialCharsToSpaces(Result,true);
end;

8
ide/ideprocs.pp
View File

@ -30,7 +30,7 @@ unit IDEProcs;
interface
uses
Classes, SysUtils, FileUtil, LCLProc, AvgLvlTree, Laz2_XMLCfg, LazUTF8,
Classes, SysUtils, FileUtil, LCLProc, AvgLvlTree, Laz2_XMLCfg,
StdCtrls, ExtCtrls,
SourceLog, FileProcs, CodeToolManager, CodeToolsConfig, CodeCache,
LazConf;
@ -1688,7 +1688,6 @@ var
p: LongInt;
begin
Result:=s;
if Result='' then exit;
// convert line breaks to single spaces
i:=length(Result);
while (i>=1) do begin
@ -1707,10 +1706,13 @@ begin
if Result[i] in [#0..#31,#127] then Result[i]:=' ';
if Result='' then exit;
if FixUTF8 then begin
Result:=copy(Result,1,strlen(PChar(Result)));
if Result='' then exit;
UniqueString(Result);
UTF8FixBroken(PChar(Result));
end;
Result:=UTF8Trim(Result);
if (Result[1]=' ') or (Result[length(Result)]=' ') then
Result:=Trim(Result);
end;
function SpecialCharsToHex(const s: string): string;