mirror of https://gitlab.com/basile.b/dexed.git
Merge branch 'master' into 1_fixes
* master: range issue doc switch sompler darwin
This commit is contained in:
commit
969c7db913
|
|
@ -648,15 +648,9 @@ begin
|
||||||
DRIVE_REMOTE: aList.Add(ltr);
|
DRIVE_REMOTE: aList.Add(ltr);
|
||||||
end;
|
end;
|
||||||
end;
|
end;
|
||||||
{$ENDIF}
|
{$ELSE}
|
||||||
{$IFDEF LINUX}
|
|
||||||
aList.Add('//');
|
aList.Add('//');
|
||||||
{$ENDIF}
|
{$ENDIF}
|
||||||
{$IFDEF DARWIN}
|
|
||||||
// tobe checked
|
|
||||||
// aList.Add('//');
|
|
||||||
raise Exception.Create('darwin: listDrives() has to be implemented');
|
|
||||||
{$ENDIF}
|
|
||||||
end;
|
end;
|
||||||
|
|
||||||
function shellOpen(const aFilename: string): boolean;
|
function shellOpen(const aFilename: string): boolean;
|
||||||
|
|
@ -723,30 +717,7 @@ begin
|
||||||
if not (poUsePipes in aProcess.Options) then
|
if not (poUsePipes in aProcess.Options) then
|
||||||
exit;
|
exit;
|
||||||
//
|
//
|
||||||
sum := 0;
|
aList.LoadFromStream(aProcess.Output);
|
||||||
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;
|
|
||||||
end;
|
end;
|
||||||
|
|
||||||
procedure processOutputToStream(aProcess: TProcess; output: TMemoryStream);
|
procedure processOutputToStream(aProcess: TProcess; output: TMemoryStream);
|
||||||
|
|
|
||||||
|
|
@ -564,6 +564,7 @@ begin
|
||||||
begin
|
begin
|
||||||
LineTextChanged(nil, 0, Lines.Count);
|
LineTextChanged(nil, 0, Lines.Count);
|
||||||
Highlighter.ScanRanges;
|
Highlighter.ScanRanges;
|
||||||
|
Highlighter.ResetRange;
|
||||||
end;
|
end;
|
||||||
identifierToD2Syn;
|
identifierToD2Syn;
|
||||||
subjDocFocused(TCEMultiDocSubject(fMultiDocSubject), self);
|
subjDocFocused(TCEMultiDocSubject(fMultiDocSubject), self);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue