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

LazBuild: fix project.pp / do not load IDE settings

Browse Source
This commit is contained in:
Martin 2023-09-12 19:55:29 +02:00
parent 2766ea87ed
commit eb52a8d6da
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ide/project.pp
View File

@ -1387,8 +1387,9 @@ begin
XMLConfig.GetValue(Path+'CursorPos/Y',1)); XMLConfig.GetValue(Path+'CursorPos/Y',1));
FFoldState := XMLConfig.GetValue(Path+'FoldState/Value', ''); FFoldState := XMLConfig.GetValue(Path+'FoldState/Value', '');
FIsLocked := XMLConfig.GetValue(Path+'IsLocked/Value', False); FIsLocked := XMLConfig.GetValue(Path+'IsLocked/Value', False);
FSyntaxHighlighter := IdeSyntaxHighlighters.GetIdForName( if IdeSyntaxHighlighters <> nil then
XMLConfig.GetValue(Path+'SyntaxHighlighter/Value', FSyntaxHighlighter := IdeSyntaxHighlighters.GetIdForName(
XMLConfig.GetValue(Path+'SyntaxHighlighter/Value',
IdeSyntaxHighlighters.Names[UnitInfo.DefaultSyntaxHighlighter])); IdeSyntaxHighlighters.Names[UnitInfo.DefaultSyntaxHighlighter]));
end; end;
@ -1406,7 +1407,8 @@ begin
XMLConfig.SetDeleteValue(Path+'FoldState/Value', FoldState, '') XMLConfig.SetDeleteValue(Path+'FoldState/Value', FoldState, '')
else else
XMLConfig.DeletePath(Path+'FoldState'); XMLConfig.DeletePath(Path+'FoldState');
XMLConfig.SetDeleteValue(Path+'SyntaxHighlighter/Value', if IdeSyntaxHighlighters <> nil then
XMLConfig.SetDeleteValue(Path+'SyntaxHighlighter/Value',
IdeSyntaxHighlighters.Names[fSyntaxHighlighter], IdeSyntaxHighlighters.Names[fSyntaxHighlighter],
IdeSyntaxHighlighters.Names[UnitInfo.DefaultSyntaxHighlighter]); IdeSyntaxHighlighters.Names[UnitInfo.DefaultSyntaxHighlighter]);
end; end;
@ -1891,7 +1893,8 @@ begin
RunFileIfActive,false); RunFileIfActive,false);
// save custom session data // save custom session data
SaveStringToStringTree(XMLConfig,CustomSessionData,Path+'CustomSessionData/'); SaveStringToStringTree(XMLConfig,CustomSessionData,Path+'CustomSessionData/');
XMLConfig.SetDeleteValue(Path+'DefaultSyntaxHighlighter/Value', if IdeSyntaxHighlighters <> nil then
XMLConfig.SetDeleteValue(Path+'DefaultSyntaxHighlighter/Value',
IdeSyntaxHighlighters.Names[FDefaultSyntaxHighlighter], IdeSyntaxHighlighters.Names[FDefaultSyntaxHighlighter],
IdeSyntaxHighlighters.Names[IdeSyntaxHighlighters.GetIdForLazSyntaxHighlighter(lshFreePascal)]); IdeSyntaxHighlighters.Names[IdeSyntaxHighlighters.GetIdForLazSyntaxHighlighter(lshFreePascal)]);
end; end;
@ -1944,8 +1947,9 @@ begin
end; end;
// session data // session data
FDefaultSyntaxHighlighter := IdeSyntaxHighlighters.GetIdForName( if IdeSyntaxHighlighters <> nil then
XMLConfig.GetValue(Path+'DefaultSyntaxHighlighter/Value', FDefaultSyntaxHighlighter := IdeSyntaxHighlighters.GetIdForName(
XMLConfig.GetValue(Path+'DefaultSyntaxHighlighter/Value',
IdeSyntaxHighlighters.Names[IdeSyntaxHighlighters.GetIdForLazSyntaxHighlighter(lshFreePascal)])); IdeSyntaxHighlighters.Names[IdeSyntaxHighlighters.GetIdForLazSyntaxHighlighter(lshFreePascal)]));
FEditorInfoList.Clear; FEditorInfoList.Clear;
FEditorInfoList.NewEditorInfo; FEditorInfoList.NewEditorInfo;