From bd190d1aec510b69c61e9efa2e62e25cb2373e67 Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Tue, 26 Apr 2022 20:32:23 +0200 Subject: [PATCH 1/3] +upd: version info for MS VS2022 (v17.1.6) update --- src/Version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Version.h b/src/Version.h index a747607d9..cb3b4861c 100644 --- a/src/Version.h +++ b/src/Version.h @@ -78,7 +78,7 @@ #if defined(_MSC_VER) #if (_MSC_VER == 1931) #if (_MSC_FULL_VER >= 193131107) - #define VER_CPL MS Visual C++ 2022 v17.1.5 + #define VER_CPL MS Visual C++ 2022 v17.1.(5-6) #elif (_MSC_FULL_VER >= 193131106) #define VER_CPL MS Visual C++ 2022 v17.1.4 #elif (_MSC_FULL_VER >= 193131105) From 58a91162c312ff7de2a7bc0aa5e791e8086d783e Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Sat, 30 Apr 2022 12:17:00 +0200 Subject: [PATCH 2/3] +fix: using by error 'Segoe UI'' as default for pure 'Text File' scheme --- src/Styles.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Styles.c b/src/Styles.c index e41514380..67e0869e7 100644 --- a/src/Styles.c +++ b/src/Styles.c @@ -2852,6 +2852,8 @@ static inline unsigned GetDefaultTextFont(LPWSTR pwchFontName, int cchFont) L"Cascadia Mono", L"Roboto Mono", L"DejaVu Sans Mono", + L"Consolas", + L"Lucida Console" }; unsigned const countof = COUNTOF(FontNamePrioList); From 0fbc51ffd41e327f65e76ccfe67056fb8a214055 Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Sat, 30 Apr 2022 13:02:56 +0200 Subject: [PATCH 3/3] + Upd: Version files and Changes.txt --- Build/Changes.txt | 3 ++- Versions/day.txt | 2 +- res/Notepad3.exe.manifest.conf | 2 +- src/VersionEx.h | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Build/Changes.txt b/Build/Changes.txt index 8ad6f0c21..96c84f095 100644 --- a/Build/Changes.txt +++ b/Build/Changes.txt @@ -34,7 +34,7 @@ UCD - (UCD)ARDET is an Encoding Detector Library ======================================================== -Current BETA/RC Version 5.22.418.(build_#) (2022-04-18) +Current BETA/RC Version 5.22.430.(build_#) (2022-04-30) ======================================================== -------------------------------------------------------- @@ -91,6 +91,7 @@ CHANGES Versions in Tools or Libraries: FIXES: -------------------------------------------------------- [.###.#]- . +[.430.1]- Using by error "Segoe UI" as default for pure "Text File" scheme. [.416.1]- Lexer style config names: differences between display and .ini-config. [.414.1]- Dark mode color style scheme global from common base/2nd. [.414.1]- Writing wrong scheme to .ini-file. diff --git a/Versions/day.txt b/Versions/day.txt index 29aae8eec..c15fb930d 100644 --- a/Versions/day.txt +++ b/Versions/day.txt @@ -1 +1 @@ -418 +430 diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index 2ff062fd2..77731256f 100644 --- a/res/Notepad3.exe.manifest.conf +++ b/res/Notepad3.exe.manifest.conf @@ -3,7 +3,7 @@ Notepad3 beta diff --git a/src/VersionEx.h b/src/VersionEx.h index 7eeb6a0f4..e11240175 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -8,7 +8,7 @@ #define SAPPNAME "Notepad3" #define VERSION_MAJOR 5 #define VERSION_MINOR 22 -#define VERSION_REV 418 +#define VERSION_REV 430 #define VERSION_BUILD 1 #define SCINTILLA_VER 520 #define LEXILLA_VER 515