From 3a18ba5bad141b0d52354ac63898ba8e8598b294 Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Tue, 13 Dec 2022 18:59:37 +0100 Subject: [PATCH 1/2] Preparation Version files for "Release_Candidate_5.22.1213.1_rc2" --- Build/Changes.txt | 14 ++++++++------ Version.cmd | 4 +++- res/Notepad3.exe.conf.manifest | 4 ++-- src/VersionEx.h | 4 ++-- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/Build/Changes.txt b/Build/Changes.txt index e7511b30a..939336701 100644 --- a/Build/Changes.txt +++ b/Build/Changes.txt @@ -34,13 +34,14 @@ UCD - (UCD)ARDET is an Encoding Detector Library ======================================================== -Current BETA/RC Version 5.22.1212.(build_#) (2022-12-12) +Current BETA/RC Version 5.22.1213.(build_#) (2022-12-13) ======================================================== -------------------------------------------------------- NEW: -------------------------------------------------------- [.###.#]- . +[1212.1]- Implementation of automatic parenthesis closure. [1029.1]- Darkmode highlight (foreground) contrast settings + default reduction to 75%. [1018.1]- Add example for tinyexpr in Modify Lines dialog. [1018.1]- Add option to auto-load most recent file from file history. @@ -61,6 +62,7 @@ NEW: CHANGES: -------------------------------------------------------- [.###.#]- . +[1212.1]- Extend AutoCloseBrackets (by Matteo-Nigro PR #4318) for Selection. [1118.2]- Using new AviSynth+ keyword lists and AviSynth colors (light/dark mode). [1020.1]- Standard DarkMode Theme. [1020.1]- Minor adjustment of grepWinNP3's layout and correction of some strings (GRE). @@ -93,17 +95,17 @@ CHANGES: -------------------------------------------------------- CHANGES Versions in Tools or Libraries: -------------------------------------------------------- +[1213.1]- Update MiniPath (MIN) version 1.0.2.191 (2022-12-13). +[1212.1]- Update Oniguruma Regex (ONI) engine version 6.9.9 (2022-12-09). +[1212.1]- Update Scintilla Library (SCI) version 5.3.2 (2022-12-06). +[1212.1]- Update Lexilla Library (LEX) version 5.2.1 (2022-12-06). [1018.1]- Update grepWinNP3 (GRE) version 2.1.11.42 (2022-10-14). -[1018.1]- Update Scintilla Library (SCI) version 5.3.1 (2022-10-12). -[1018.1]- Update Lexilla Library (LEX) version 5.2.0 (2022-10-12). -[1018.1]- Update Oniguruma Regex (ONI) engine version 6.9.9 (2022-09-06). -[.713.1]- Update MiniPath (MIN) version 1.0.2.181 (2020-07-13). -------------------------------------------------------- FIXES: -------------------------------------------------------- [.###.#]- . -[1212.1]- "Notepad3 Replacement" after update to Win11 22H2 (SUP). +[1212.1]- "Notepad3 Replacement" after Win11 22H2 update (SUP). [1212.1]- Oniguruma fix (ONIG_OPTION_FIND_LONGEST behavior) (ONI). [1212.1]- Make current line visible after word-wrap-mode toggle. [1125.1]- Restore and correction the line "IDM_SETPASS" in menu_fr_fr_rc. diff --git a/Version.cmd b/Version.cmd index 5b198218b..7e99dcc33 100644 --- a/Version.cmd +++ b/Version.cmd @@ -6,7 +6,9 @@ setlocal enableextensions set SCRIPTNAME=%~dpn0.ps1 set ARGS=%* -set POSTFIX=beta +:: set POSTFIX= (blank) or beta or rc or rc2 + +set POSTFIX=rc2 if ["%POSTFIX%"] == [""] ( if ["%~1"] neq [""] call :ESCAPE_ARGS ) else ( diff --git a/res/Notepad3.exe.conf.manifest b/res/Notepad3.exe.conf.manifest index 030a11bd3..60eadff06 100644 --- a/res/Notepad3.exe.conf.manifest +++ b/res/Notepad3.exe.conf.manifest @@ -3,9 +3,9 @@ - Notepad3 beta + Notepad3 rc2 diff --git a/src/VersionEx.h b/src/VersionEx.h index 8310b5717..0992e0e55 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 1212 +#define VERSION_REV 1213 #define VERSION_BUILD 1 #define SCINTILLA_VER 532 #define LEXILLA_VER 521 @@ -16,5 +16,5 @@ #define UCHARDET_VER 2018.09.27 #define TINYEXPR_VER 2018.05.11 #define UTHASH_VER 2.3.0 -#define VERSION_PATCH beta +#define VERSION_PATCH rc2 #define VERSION_COMMIT_ID dkt1-amr From 049011d6c4e3798172373f03c6a22af39c4efa6c Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Tue, 13 Dec 2022 19:00:48 +0100 Subject: [PATCH 2/2] Revert "Preparation Version files for "Release_Candidate_5.22.1213.1_rc2"" This reverts commit 3a18ba5bad141b0d52354ac63898ba8e8598b294. --- Build/Changes.txt | 14 ++++++-------- Version.cmd | 4 +--- res/Notepad3.exe.conf.manifest | 4 ++-- src/VersionEx.h | 4 ++-- 4 files changed, 11 insertions(+), 15 deletions(-) diff --git a/Build/Changes.txt b/Build/Changes.txt index 939336701..e7511b30a 100644 --- a/Build/Changes.txt +++ b/Build/Changes.txt @@ -34,14 +34,13 @@ UCD - (UCD)ARDET is an Encoding Detector Library ======================================================== -Current BETA/RC Version 5.22.1213.(build_#) (2022-12-13) +Current BETA/RC Version 5.22.1212.(build_#) (2022-12-12) ======================================================== -------------------------------------------------------- NEW: -------------------------------------------------------- [.###.#]- . -[1212.1]- Implementation of automatic parenthesis closure. [1029.1]- Darkmode highlight (foreground) contrast settings + default reduction to 75%. [1018.1]- Add example for tinyexpr in Modify Lines dialog. [1018.1]- Add option to auto-load most recent file from file history. @@ -62,7 +61,6 @@ NEW: CHANGES: -------------------------------------------------------- [.###.#]- . -[1212.1]- Extend AutoCloseBrackets (by Matteo-Nigro PR #4318) for Selection. [1118.2]- Using new AviSynth+ keyword lists and AviSynth colors (light/dark mode). [1020.1]- Standard DarkMode Theme. [1020.1]- Minor adjustment of grepWinNP3's layout and correction of some strings (GRE). @@ -95,17 +93,17 @@ CHANGES: -------------------------------------------------------- CHANGES Versions in Tools or Libraries: -------------------------------------------------------- -[1213.1]- Update MiniPath (MIN) version 1.0.2.191 (2022-12-13). -[1212.1]- Update Oniguruma Regex (ONI) engine version 6.9.9 (2022-12-09). -[1212.1]- Update Scintilla Library (SCI) version 5.3.2 (2022-12-06). -[1212.1]- Update Lexilla Library (LEX) version 5.2.1 (2022-12-06). [1018.1]- Update grepWinNP3 (GRE) version 2.1.11.42 (2022-10-14). +[1018.1]- Update Scintilla Library (SCI) version 5.3.1 (2022-10-12). +[1018.1]- Update Lexilla Library (LEX) version 5.2.0 (2022-10-12). +[1018.1]- Update Oniguruma Regex (ONI) engine version 6.9.9 (2022-09-06). +[.713.1]- Update MiniPath (MIN) version 1.0.2.181 (2020-07-13). -------------------------------------------------------- FIXES: -------------------------------------------------------- [.###.#]- . -[1212.1]- "Notepad3 Replacement" after Win11 22H2 update (SUP). +[1212.1]- "Notepad3 Replacement" after update to Win11 22H2 (SUP). [1212.1]- Oniguruma fix (ONIG_OPTION_FIND_LONGEST behavior) (ONI). [1212.1]- Make current line visible after word-wrap-mode toggle. [1125.1]- Restore and correction the line "IDM_SETPASS" in menu_fr_fr_rc. diff --git a/Version.cmd b/Version.cmd index 7e99dcc33..5b198218b 100644 --- a/Version.cmd +++ b/Version.cmd @@ -6,9 +6,7 @@ setlocal enableextensions set SCRIPTNAME=%~dpn0.ps1 set ARGS=%* -:: set POSTFIX= (blank) or beta or rc or rc2 - -set POSTFIX=rc2 +set POSTFIX=beta if ["%POSTFIX%"] == [""] ( if ["%~1"] neq [""] call :ESCAPE_ARGS ) else ( diff --git a/res/Notepad3.exe.conf.manifest b/res/Notepad3.exe.conf.manifest index 60eadff06..030a11bd3 100644 --- a/res/Notepad3.exe.conf.manifest +++ b/res/Notepad3.exe.conf.manifest @@ -3,9 +3,9 @@ - Notepad3 rc2 + Notepad3 beta diff --git a/src/VersionEx.h b/src/VersionEx.h index 0992e0e55..8310b5717 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 1213 +#define VERSION_REV 1212 #define VERSION_BUILD 1 #define SCINTILLA_VER 532 #define LEXILLA_VER 521 @@ -16,5 +16,5 @@ #define UCHARDET_VER 2018.09.27 #define TINYEXPR_VER 2018.05.11 #define UTHASH_VER 2.3.0 -#define VERSION_PATCH rc2 +#define VERSION_PATCH beta #define VERSION_COMMIT_ID dkt1-amr