Merge branch 'main' into isscint-update

# Conflicts:
#	Projects/Src/CompScintEdit.pas

Projects/Src/CompScintEdit.pas

@@ -196,14 +196,14 @@ begin
 
   Call(SCI_INDICSETSTYLE, inWordAtCursorOccurrence, INDIC_STRAIGHTBOX);
   Call(SCI_INDICSETFORE, inWordAtCursorOccurrence, clSilver); { May be overwritten by UpdateThemeColorsAndStyleAttributes }
-  Call(SCI_INDICSETALPHA, inWordAtCursorOccurrence, 255);
-  Call(SCI_INDICSETOUTLINEALPHA, inWordAtCursorOccurrence, 255);
+  Call(SCI_INDICSETALPHA, inWordAtCursorOccurrence, SC_ALPHA_OPAQUE);
+  Call(SCI_INDICSETOUTLINEALPHA, inWordAtCursorOccurrence, SC_ALPHA_OPAQUE);
   Call(SCI_INDICSETUNDER, inWordAtCursorOccurrence, 1);
 
   Call(SCI_INDICSETSTYLE, inSelTextOccurrence, INDIC_STRAIGHTBOX);
   Call(SCI_INDICSETFORE, inSelTextOccurrence, clSilver); { May be overwritten by UpdateThemeColorsAndStyleAttributes }
-  Call(SCI_INDICSETALPHA, inSelTextOccurrence, 255);
-  Call(SCI_INDICSETOUTLINEALPHA, inSelTextOccurrence, 255);
+  Call(SCI_INDICSETALPHA, inSelTextOccurrence, SC_ALPHA_OPAQUE);
+  Call(SCI_INDICSETOUTLINEALPHA, inSelTextOccurrence, SC_ALPHA_OPAQUE);
   Call(SCI_INDICSETUNDER, inSelTextOccurrence, 1);
 
   { Set up the gutter column with line numbers - avoid Scintilla's 'reverse arrow'