paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-08 09:38:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE, SynEdit: PascalHighlighter, added ModifierAttr load defaults in EditorOpts

Browse Source
This commit is contained in:
Martin 2024-01-25 00:08:00 +01:00
parent 4a8561b0d5
commit 3d8a7ef31b
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ide/editoroptions.pp
View File

@ -732,6 +732,8 @@ const
Colors for MarkupFoldColor can now have gaps (before unset colors were filtered)
* Changes in Version 13:
CtrlMiddleTabClickClosesOthers was replaced by MiddleTabClickClosesOthersModifier
* Changes in Version 14:
Introduced "Modifier" to pascal. Prior versions must load "Reserved word"
}
EditorMouseOptsFormatVersion = 1;
{ * Changes in Version 6:
@ -7135,12 +7137,23 @@ begin
for i := 0 to AttributeCount - 1 do begin
CurAttr := AttributeAtPos[i];
if Defaults <> nil then
Def := Defaults.Attribute[CurAttr.StoredName]
else begin
Def := CurAttr.GetSchemeGlobal;
if Def = nil then
Def := EmptyDef;
Def := nil;
if (ColorVersion < 14) and (RealFormatVersion < 14) and
(Defaults = nil) and
(CurAttr.GetSchemeGlobal = nil) and
(CurAttr.StoredName = SYNS_XML_AttrModifier) and
not (aXMLConfig.HasPath(TmpPath+SYNS_XML_AttrModifier, False))
then
Def := Attribute[SYNS_XML_AttrReservedWord];
if Def = nil then begin
if Defaults <> nil then
Def := Defaults.Attribute[CurAttr.StoredName]
else begin
Def := CurAttr.GetSchemeGlobal;
if Def = nil then
Def := EmptyDef;
end;
end;
CurAttr.LoadFromXml(aXMLConfig, TmpPath, Def, FormatVersion);
if (ColorVersion < 9) and (RealFormatVersion < 9)