mirror of https://gitlab.com/basile.b/dexed.git
update fcl-json
This commit is contained in:
parent
5d920aef7e
commit
bcd374526f
|
@ -154,22 +154,22 @@ end;
|
|||
procedure TJSONConfig.Flush;
|
||||
|
||||
Var
|
||||
F : Text;
|
||||
F : TFileStream;
|
||||
S : TJSONStringType;
|
||||
|
||||
begin
|
||||
if Modified then
|
||||
begin
|
||||
AssignFile(F,FileName);
|
||||
Rewrite(F);
|
||||
F:=TFileStream.Create(FileName,fmCreate);
|
||||
Try
|
||||
if Formatted then
|
||||
S:=FJSON.FormatJSON(Formatoptions,FormatIndentSize)
|
||||
else
|
||||
S:=FJSON.AsJSON;
|
||||
Writeln(F,S);
|
||||
if S>'' then
|
||||
F.WriteBuffer(S[1],Length(S));
|
||||
Finally
|
||||
CloseFile(F);
|
||||
F.Free;
|
||||
end;
|
||||
FModified := False;
|
||||
end;
|
||||
|
|
|
@ -370,7 +370,7 @@ begin
|
|||
parser := TJSONParser.Create(loader, [joIgnoreTrailingComma, joUTF8]);
|
||||
//TODO-cfcl-json: remove etc/fcl-json the day they'll merge and rlz the version with 'Options'
|
||||
//TODO-cfcl-json: track possible changes and fixes at http://svn.freepascal.org/cgi-bin/viewvc.cgi/trunk/packages/fcl-json/
|
||||
//latest in in etc = rev 33310.
|
||||
//latest in etc = rev 34196.
|
||||
try
|
||||
try
|
||||
fJSON := parser.Parse as TJSONObject;
|
||||
|
|
|
@ -1488,6 +1488,7 @@ procedure TCEMainForm.DoFirstShow;
|
|||
var
|
||||
url: string;
|
||||
begin
|
||||
inherited;
|
||||
// TODO-cbetterfix: clipboard doesn't work first time it's used on a reloaded doc.
|
||||
// see: http://forum.lazarus.freepascal.org/index.php/topic,30616.0.htm
|
||||
if fAppliOpts.reloadLastDocuments then
|
||||
|
|
Loading…
Reference in New Issue