Make Scintilla 5 API methods compatible with the FPC RTL

Author: Robert Di Pardo

src/Include/SciSupport.inc

@@ -669,14 +669,18 @@ const
     SCI_SETWHITESPACECHARS = 2443;
     SCI_STARTRECORD = 3001;
     SCI_STOPRECORD = 3002;
+{$IFNDEF SCI_5}
     SCI_SETLEXER = 4001;
+{$ENDIF}
     SCI_GETLEXER = 4002;
     SCI_COLOURISE = 4003;
     SCI_SETPROPERTY = 4004;
     KEYWORDSET_MAX = 8;
     SCI_SETKEYWORDS = 4005;
+{$IFNDEF SCI_5}
     SCI_SETLEXERLANGUAGE = 4006;
     SCI_LOADLEXERLIBRARY = 4007;
+{$ENDIF}
     SCI_GETPROPERTY = 4008;
     SCI_GETPROPERTYEXPANDED = 4009;
     SCI_GETPROPERTYINT = 4010;

src/LibNppPlugin/NppSimpleObjects.pas

@@ -1045,13 +1045,17 @@ function GetSciMessageConstString(AMessage: Cardinal): string;
     SCI_GETCARETLINEBACKALPHA: Result := 'SCI_GETCARETLINEBACKALPHA';
     SCI_STARTRECORD: Result := 'SCI_STARTRECORD';
     SCI_STOPRECORD: Result := 'SCI_STOPRECORD';
+{$IFNDEF SCI_5}
     SCI_SETLEXER: Result := 'SCI_SETLEXER';
+{$ENDIF}
     SCI_GETLEXER: Result := 'SCI_GETLEXER';
     SCI_COLOURISE: Result := 'SCI_COLOURISE';
     SCI_SETPROPERTY: Result := 'SCI_SETPROPERTY';
     SCI_SETKEYWORDS: Result := 'SCI_SETKEYWORDS';
+{$IFNDEF SCI_5}
     SCI_SETLEXERLANGUAGE: Result := 'SCI_SETLEXERLANGUAGE';
     SCI_LOADLEXERLIBRARY: Result := 'SCI_LOADLEXERLIBRARY';
+{$ENDIF}
     SCI_GETPROPERTY: Result := 'SCI_GETPROPERTY';
     SCI_GETPROPERTYEXPANDED: Result := 'SCI_GETPROPERTYEXPANDED';
     SCI_GETPROPERTYINT: Result := 'SCI_GETPROPERTYINT';
@@ -1483,7 +1487,15 @@ function TActiveDocument.GetText: WideString;
 begin
   Len := SendMessage(SCI_GETTEXT, WPARAM(High(Sci_PositionU)) - 1, nil);
 {$IFDEF SCI_5}
+{$IFNDEF FPC}
   Len := Round(MinValue([Len + 1, SendMessage(SCI_GETLENGTH)]));
+{$ELSE}
+{$IFDEF CPUx64}
+  Len := Round(MinValue([Extended(Len + 1), Extended(SendMessage(SCI_GETLENGTH))]));
+{$ELSE}
+  Inc(Len);
+{$ENDIF}
+{$ENDIF}
 {$ENDIF}
   SetLength(Chars, Len);
   SendMessage(SCI_GETTEXT, Len, PAnsiChar(Chars));

src/prj/HTMLTag.lpi

@@ -69,6 +69,7 @@
           <Other>
             <CustomOptions Value="-dUNICODE
 -dNPPUNICODE
+-dSCI_5
 -FcUTF8
 -vm2026,4104,5024"/>
             <OtherDefines Count="2">
@@ -173,6 +174,7 @@
       <CustomOptions Value="-dUNICODE
 -dNPPUNICODE
 -FcUTF8
+-dSCI_5
 -WN
 -vm2026"/>
     </Other>