From 404a6d9c3ba40ffd256b2086a4da2668fc4f8009 Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Wed, 11 Mar 2020 09:31:20 +0100 Subject: [PATCH 1/3] +add: add a test UTF-8 file in "test\test_files\encoding\UTF-8" directory --- ...special chars (utf-8) (Conf=43) (issue #2076).txt | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 test/test_files/encoding/UTF-8/Summary special chars (utf-8) (Conf=43) (issue #2076).txt diff --git a/test/test_files/encoding/UTF-8/Summary special chars (utf-8) (Conf=43) (issue #2076).txt b/test/test_files/encoding/UTF-8/Summary special chars (utf-8) (Conf=43) (issue #2076).txt new file mode 100644 index 000000000..5942250e1 --- /dev/null +++ b/test/test_files/encoding/UTF-8/Summary special chars (utf-8) (Conf=43) (issue #2076).txt @@ -0,0 +1,12 @@ +Open 7-bit ASCII files in UTF-8 mode. is NOT checked ! +------------------------------------------------------ +Your update is merged. 👍 +Your comments and suggestions are welcome... 😃 +Thanks for your interest and your contributions to Notepad3. 👍 😃 +sk-SK: [Slovak (Slovakia)] - [Slovenčina (Slovensko)] +Latitude Longitude: 50° 35' North, 3° 53' East +Description:"Subtítulos" and Description:"Súbtitulos" +Précis: and echo: 输入u盘目录 +le développement continue! +Dös üst ön ßaurer (ẞAURER) Äpfel! + From 931346ffd3c8245ea1c3633ab07fe7b3e4eef54b Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Wed, 11 Mar 2020 09:45:52 +0100 Subject: [PATCH 2/3] chg: +chg: correction headline --- .../Summary special chars (utf-8) (Conf=43) (issue #2076).txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test_files/encoding/UTF-8/Summary special chars (utf-8) (Conf=43) (issue #2076).txt b/test/test_files/encoding/UTF-8/Summary special chars (utf-8) (Conf=43) (issue #2076).txt index 5942250e1..e40f291be 100644 --- a/test/test_files/encoding/UTF-8/Summary special chars (utf-8) (Conf=43) (issue #2076).txt +++ b/test/test_files/encoding/UTF-8/Summary special chars (utf-8) (Conf=43) (issue #2076).txt @@ -1,4 +1,4 @@ -Open 7-bit ASCII files in UTF-8 mode. is NOT checked ! +Open 7-bit ASCII files in UTF-8 mode is checked ! ------------------------------------------------------ Your update is merged. 👍 Your comments and suggestions are welcome... 😃 From 5ca0998e2c1602d96d9c49152017869293d9e2b8 Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Wed, 11 Mar 2020 10:13:57 +0100 Subject: [PATCH 3/3] +ver: VS2019 version update - VS 16.4.6 --- Versions/day.txt | 2 +- res/Notepad3.exe.manifest.conf | 2 +- src/Version.h | 4 +++- src/VersionEx.h | 4 ++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Versions/day.txt b/Versions/day.txt index 54ea97e96..b661fff6c 100644 --- a/Versions/day.txt +++ b/Versions/day.txt @@ -1 +1 @@ -310 +311 diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index f9df86410..ccfb5e663 100644 --- a/res/Notepad3.exe.manifest.conf +++ b/res/Notepad3.exe.manifest.conf @@ -3,7 +3,7 @@ Notepad3 RC3 diff --git a/src/Version.h b/src/Version.h index 7627b82b3..f268f78d4 100644 --- a/src/Version.h +++ b/src/Version.h @@ -74,7 +74,9 @@ #if defined(_MSC_VER) #if (_MSC_VER == 1924) - #if(_MSC_FULL_VER >= 192428316) + #if(_MSC_FULL_VER >= 192428319) + #define VER_CPL MS Visual C++ 2019 v16.4.6 + #elif(_MSC_FULL_VER >= 192428316) #define VER_CPL MS Visual C++ 2019 v16.4.(4-5) #elif(_MSC_FULL_VER >= 192428315) #define VER_CPL MS Visual C++ 2019 v16.4.3 diff --git a/src/VersionEx.h b/src/VersionEx.h index 8766ecbbd..5b2d9a3c5 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -8,7 +8,7 @@ #define SAPPNAME "Notepad3" #define VERSION_MAJOR 5 #define VERSION_MINOR 20 -#define VERSION_REV 310 +#define VERSION_REV 311 #define VERSION_BUILD 1 #define SCINTILLA_VER 432 #define ONIGURUMA_REGEX_VER 6.9.4 @@ -16,4 +16,4 @@ #define TINYEXPR_VER 2018.05.11 #define UTHASH_VER 2.1.0 #define VERSION_PATCH RC3 -#define VERSION_COMMIT_ID nebukadn +#define VERSION_COMMIT_ID dkt1-amr