Merge remote-tracking branch 'upstream/master' into RC2_DEV

Build/Changes.txt

@@ -103,7 +103,7 @@ CHANGES:
 - Allow each modification step to split undo typing sequence (set timeout < 20ms).
 - Split undo typing sequence (by line-breaks and/or timeout).
 - Update Oniguruma Regex (ONI) engine version 6.9.5 (2020/01/28).
-- Update Scintilla Library (SCI) version 4.3.0 (2020/01/16).
+- Update Scintilla Library (SCI) version 4.3.1 (2020/03/04).
 
 -----------------------------------------------------
 ENHANCEMENT:
@@ -123,6 +123,8 @@ ENHANCEMENT:
 -----------------------------------------------------
 FIXES:
 -----------------------------------------------------
+- Correct return result of Styles export.
+- Scintilla method declaration.
 - Move hardcoded lexer <-> filename (w/o .ext) associations to configurable scheme (regex def).
 - Drag&drop rectangular selection shuffles chars.
 - Paint() hangs due to unnecessary LockWindowsUpdate().

Versions/build.txt

@@ -1 +1 @@
-3
+4

res/Notepad3.exe.manifest.conf

@@ -3,7 +3,7 @@
   <assemblyIdentity
     name="Notepad3"
     processorArchitecture="*"
-    version="5.20.302.3"
+    version="5.20.302.4"
     type="win32"
   />
   <description>Notepad3 RC2</description>

src/VersionEx.h

@@ -9,9 +9,9 @@
 #define VERSION_MAJOR 5
 #define VERSION_MINOR 20
 #define VERSION_REV 302
-#define VERSION_BUILD 3
+#define VERSION_BUILD 4
 #define SCINTILLA_VER 431
-#define ONIGURUMA_REGEX_VER 6.9.4
+#define ONIGURUMA_REGEX_VER 6.9.5
 #define UCHARDET_VER 2018.09.27
 #define TINYEXPR_VER 2018.05.11
 #define UTHASH_VER 2.1.0