From 7f45e10381f8fb6c3b2be41f5c29165828bbac8c Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Wed, 12 May 2021 00:13:52 +0200 Subject: [PATCH] + Upd: Version files, Changes.txt and MS VS 2019 version update (v16.9.5) --- Build/Changes.txt | 2 ++ Versions/build.txt | 2 +- res/Notepad3.exe.manifest.conf | 2 +- src/Version.h | 4 +++- src/VersionEx.h | 2 +- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Build/Changes.txt b/Build/Changes.txt index 275f7d63d..d35acae73 100644 --- a/Build/Changes.txt +++ b/Build/Changes.txt @@ -120,6 +120,8 @@ CHANGES: FIXES: -------------------------------------------------------- [.###.#]- . +[.511.2]- TinyExpr: expr need not start with blank. +[.511.2]- TinyExpr: UTF-8 to ANSI-CP-1252 conversion should yield invalid characters instead of blank or currency. [.511.1]- Space-width, avgchar-width and tab-width calculation. [.511.1]- Scintilla missing recalculation of space width (to get correct tab width for indentation). [.511.1]- Revert to Scintilla std tabwidth calculation on font changes. diff --git a/Versions/build.txt b/Versions/build.txt index d00491fd7..0cfbf0888 100644 --- a/Versions/build.txt +++ b/Versions/build.txt @@ -1 +1 @@ -1 +2 diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index 9eabf4d28..0d2856a1b 100644 --- a/res/Notepad3.exe.manifest.conf +++ b/res/Notepad3.exe.manifest.conf @@ -3,7 +3,7 @@ Notepad3 beta diff --git a/src/Version.h b/src/Version.h index 0e3652e4b..733b50aab 100644 --- a/src/Version.h +++ b/src/Version.h @@ -77,7 +77,9 @@ #if defined(_MSC_VER) #if (_MSC_VER == 1928) - #if (_MSC_FULL_VER >= 192829914) + #if (_MSC_FULL_VER >= 192829915) + #define VER_CPL MS Visual C++ 2019 v16.9.5 + #elif (_MSC_FULL_VER >= 192829914) #define VER_CPL MS Visual C++ 2019 v16.9.4 #elif (_MSC_FULL_VER >= 192829913) #define VER_CPL MS Visual C++ 2019 v16.9.(2-3) diff --git a/src/VersionEx.h b/src/VersionEx.h index 1e19e4554..5139d2b76 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -9,7 +9,7 @@ #define VERSION_MAJOR 5 #define VERSION_MINOR 21 #define VERSION_REV 511 -#define VERSION_BUILD 1 +#define VERSION_BUILD 2 #define SCINTILLA_VER 502 #define LEXILLA_VER 502 #define ONIGURUMA_REGEX_VER 7.0.0