diff --git a/Build/Changes.txt b/Build/Changes.txt index a5cddb097..c76840967 100644 --- a/Build/Changes.txt +++ b/Build/Changes.txt @@ -33,7 +33,7 @@ UCD - (UCD)ARDET is an Encoding Detector Library ======================================================== -Current BETA/RC Version 5.21.1119.(build_#) (2021-11-19) +Current BETA/RC Version 5.21.1125.(build_#) (2021-11-25) ======================================================== -------------------------------------------------------- @@ -47,10 +47,12 @@ NEW: CHANGES: -------------------------------------------------------- [.###.#]- . +[.alpha]- Default settings: LaunchInstanceWndPosOffset=28 and LaunchInstanceFullVisible=true. [.alpha]- Lexer Fortran: add extended intrinsic functions. [.alpha]- Some more DynStrg refactorings and LongPath handling. -------------------------------------------------------- [.###.#]- . +[1125.1]- Switching to Philippe Lhoste's (PhiLho) AutoHotkey (AHK) Lexer. [1119.1]- Migration of Solution/Projects/Src for VS2022. [1117.1]- Switch to Scintilla default idle styling mode (none). [1115.1]- Reverting changes to F/R behavior, correction for empty pattern. @@ -88,6 +90,8 @@ FIXES: [.alpha]- Path_StripPath(). -------------------------------------------------------- [.###.#]- . +[1125.1]- Sync with current Oniguruma v7.0(ß) dev. +[1125.1]- Some other findings on the positioning of multi-instance launch. [1119.2]- Relaunch multi instances: don't cascade if pos param already defined. [1119.2]- Positioning on separate instance launch. [1119.1]- Positioning multi instance launch. diff --git a/Versions/build.txt b/Versions/build.txt index 0cfbf0888..d00491fd7 100644 --- a/Versions/build.txt +++ b/Versions/build.txt @@ -1 +1 @@ -2 +1 diff --git a/Versions/day.txt b/Versions/day.txt index 487285274..706146535 100644 --- a/Versions/day.txt +++ b/Versions/day.txt @@ -1 +1 @@ -1119 +1125 diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index 0ba657f12..f010eed2a 100644 --- a/res/Notepad3.exe.manifest.conf +++ b/res/Notepad3.exe.manifest.conf @@ -3,7 +3,7 @@ Notepad3 rc diff --git a/src/Helpers.c b/src/Helpers.c index 2fa45574e..53f2401d1 100644 --- a/src/Helpers.c +++ b/src/Helpers.c @@ -220,8 +220,11 @@ static void _GetTrueWindowsVersion() #endif // ---------------------------------------------------------------------------- -// https://docs.microsoft.com/en-US/windows/release-health/release-information -// https://docs.microsoft.com/en-US/windows-insider/active-dev-branch +// https://docs.microsoft.com/en-us/windows/release-health/ (Windows releases health) +// https://docs.microsoft.com/en-us/windows/release-health/release-information (Windows 10) +// https://docs.microsoft.com/en-us/windows/release-health/windows11-release-information (Windows 11) +// https://docs.microsoft.com/en-us/windows/release-health/windows-server-release-info (Windows Server) +// https://docs.microsoft.com/en-us/windows-insider/flight-hub/ (Windows Insider Preview Builds) // ---------------------------------------------------------------------------- static LPCWSTR _Win10BuildToReleaseId() { @@ -230,7 +233,7 @@ static LPCWSTR _Win10BuildToReleaseId() { DWORD const build = GetWindowsBuildNumber(NULL, NULL); if (build > 19043) { - _wchpReleaseID = L"21H2 [Insdr]"; + _wchpReleaseID = L"21H2"; } else if (build > 19042) { _wchpReleaseID = L"21H1"; } else if (build > 19041) { diff --git a/src/VersionEx.h b/src/VersionEx.h index 45f62ee42..ee88b9b89 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -8,8 +8,8 @@ #define SAPPNAME "Notepad3" #define VERSION_MAJOR 5 #define VERSION_MINOR 21 -#define VERSION_REV 1119 -#define VERSION_BUILD 2 +#define VERSION_REV 1125 +#define VERSION_BUILD 1 #define SCINTILLA_VER 511 #define LEXILLA_VER 511 #define ONIGURUMA_REGEX_VER 7.0.0