From 97221ea590dab828efae8dcbf5a9ffbc7f5d38e8 Mon Sep 17 00:00:00 2001 From: Basile Burg Date: Wed, 17 Jun 2015 23:57:15 +0200 Subject: [PATCH 1/3] darwin --- src/ce_common.pas | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/ce_common.pas b/src/ce_common.pas index dbab9447..0da4c5f4 100644 --- a/src/ce_common.pas +++ b/src/ce_common.pas @@ -648,15 +648,9 @@ begin DRIVE_REMOTE: aList.Add(ltr); end; end; - {$ENDIF} - {$IFDEF LINUX} + {$ELSE} aList.Add('//'); {$ENDIF} - {$IFDEF DARWIN} - // tobe checked - // aList.Add('//'); - raise Exception.Create('darwin: listDrives() has to be implemented'); - {$ENDIF} end; function shellOpen(const aFilename: string): boolean; From f1e21098a7fc40cfb760302437cc4e048a4d4148 Mon Sep 17 00:00:00 2001 From: Basile Burg Date: Wed, 17 Jun 2015 23:57:37 +0200 Subject: [PATCH 2/3] sompler --- src/ce_common.pas | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/src/ce_common.pas b/src/ce_common.pas index 0da4c5f4..4eb32521 100644 --- a/src/ce_common.pas +++ b/src/ce_common.pas @@ -717,30 +717,7 @@ begin if not (poUsePipes in aProcess.Options) then exit; // - sum := 0; - str := TMemoryStream.Create; - try - buffSz := aProcess.PipeBufferSize; - // temp fix: messages are cut if the TAsyncProcess version is used on simple TProcess. - if aProcess is TAsyncProcess then begin - while aProcess.Output.NumBytesAvailable <> 0 do begin - str.SetSize(sum + buffSz); - cnt := aProcess.Output.Read((str.Memory + sum)^, buffSz); - sum += cnt; - end; - end else begin - repeat - str.SetSize(sum + buffSz); - cnt := aProcess.Output.Read((str.Memory + sum)^, buffSz); - sum += cnt; - until - cnt = 0; - end; - str.Size := sum; - aList.LoadFromStream(str); - finally - str.Free; - end; + aList.LoadFromStream(aProcess.Output); end; procedure processOutputToStream(aProcess: TProcess; output: TMemoryStream); From 45317a2565b02ee898f6aa846332eaa605f08786 Mon Sep 17 00:00:00 2001 From: Basile Burg Date: Wed, 17 Jun 2015 23:58:01 +0200 Subject: [PATCH 3/3] range issue doc switch --- src/ce_synmemo.pas | 1 + 1 file changed, 1 insertion(+) diff --git a/src/ce_synmemo.pas b/src/ce_synmemo.pas index a9f5079a..5c737799 100644 --- a/src/ce_synmemo.pas +++ b/src/ce_synmemo.pas @@ -564,6 +564,7 @@ begin begin LineTextChanged(nil, 0, Lines.Count); Highlighter.ScanRanges; + Highlighter.ResetRange; end; identifierToD2Syn; subjDocFocused(TCEMultiDocSubject(fMultiDocSubject), self);