Merge branch 'main' into autocompleteclasses

# Conflicts:
#	Files/isscint.dll

Projects/Src/Compil32/IsscintInt.pas

@@ -17,19 +17,19 @@ const
   SCI_CUTALLOWLINE = 2805;
   SCI_AUTOCSETSTYLE = 2806;
   SCI_AUTOGSETSTYLE = 2807;
-  SCI_LINETAB = 2808;
-  SCI_LINEBACKTAB = 2809;
-  SC_MOUSEMAPPING_DEFAULT = 0;
-  SC_MOUSEMAPPING_VSCODE_WINDOWS = 1;
-  SCI_SETMOUSEMAPPING = 2810;
-  SCI_GETMOUSEMAPPING = 2811;
+  SCI_LINEINDENT = 2808;
+  SCI_LINEDEDENT = 2809;
+  SC_AUTOCOMPLETE_DARK_MODE = 4;
+  SCI_CALLTIPSETFOREBORDER = 2810;
+  SCI_AUTOCSETMINWIDTH = 2811;
+  SCI_AUTOCGETMINWIDTH = 2812;
   SC_CMDKEYS_DEFAULT = 0;
   SC_CMDKEYS_VSCODE_WINDOWS = 1;
-  SCI_RESETALLCMDKEYS = 2812;
-  SC_AUTOCOMPLETE_DARK_MODE = 4;
-  SCI_CALLTIPSETFOREBORDER = 2813;
-  SCI_AUTOCSETMINWIDTH = 2814;
-  SCI_AUTOCGETMINWIDTH = 2815;
+  SCI_RESETALLCMDKEYS = 2813;
+  SC_MOUSEMAPPING_DEFAULT = 0;
+  SC_MOUSEMAPPING_VSCODE_WINDOWS = 1;
+  SCI_SETMOUSEMAPPING = 2814;
+  SCI_GETMOUSEMAPPING = 2815;
 
 implementation