diff --git a/Build/Changes.txt b/Build/Changes.txt index 17cc1ba2f..24a58094b 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.1112.(build_#) (2021-11-12) +Current BETA/RC Version 5.21.1115.(build_#) (2021-11-15) ======================================================== -------------------------------------------------------- @@ -46,6 +46,7 @@ NEW: CHANGES: -------------------------------------------------------- [.###.#]- . +[1115.1]- Reverting changes to F/R behavior, correction for empty pattern. [1021.1]- On file restore, do not notify immediately, but check against stored file attributes. [1015.1]- Remove the max win version check for undocumented DarkMode UxTheme methods. [1015.1]- DarkMode enable up to Win11 build 22471. @@ -69,6 +70,9 @@ CHANGES Versions in Tools or Libraries: FIXES: -------------------------------------------------------- [.###.#]- . +[1115.1]- Don't clear occurrence markers for unchanged search pattern. +[1115.1]- Correction to VS2019 project settings. +[1115.1]- Find/Repl wildcard pattern handling. [1112.1]- Find/Repl dialog - empty search string should have no match (blue). [1030.1]- Wrong format for reporting number of replaced occurrences "In Selection". [1030.1]- "grepWinNP3" not intended switching file size search settings (GRE). diff --git a/Notepad3.sln b/Notepad3.sln index 2f6f1b2d5..ab9f96d5b 100644 --- a/Notepad3.sln +++ b/Notepad3.sln @@ -23,6 +23,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Notepad3", "src\Notepad3.vc {0FA07345-601B-474E-99C0-7E61E70DA72E} = {0FA07345-601B-474E-99C0-7E61E70DA72E} {C8E80B4C-C0FD-4119-A05A-AB372A61007F} = {C8E80B4C-C0FD-4119-A05A-AB372A61007F} {76A53B4D-3011-4AAB-8DE9-C0D080FA95CF} = {76A53B4D-3011-4AAB-8DE9-C0D080FA95CF} + {1F757558-0E57-4DE5-82D6-A14E9D81F05F} = {1F757558-0E57-4DE5-82D6-A14E9D81F05F} {B7C9135A-C4AA-4A85-B361-B610B442B57C} = {B7C9135A-C4AA-4A85-B361-B610B442B57C} {15428F5A-16F1-4DA5-9F12-0411183E3DC0} = {15428F5A-16F1-4DA5-9F12-0411183E3DC0} {9B31015C-CB08-4B4B-A957-313A93F862F5} = {9B31015C-CB08-4B4B-A957-313A93F862F5} @@ -30,6 +31,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Notepad3", "src\Notepad3.vc {8BB7B168-FC6D-463A-BBE4-FA595BDD5753} = {8BB7B168-FC6D-463A-BBE4-FA595BDD5753} {4484EA6C-AA9D-4DE4-BAA1-535FFFEFE49E} = {4484EA6C-AA9D-4DE4-BAA1-535FFFEFE49E} {7E16647B-CA40-43E8-8ABB-E4C430C186CA} = {7E16647B-CA40-43E8-8ABB-E4C430C186CA} + {0873B090-7FFD-4ABD-9B42-619A06C5041F} = {0873B090-7FFD-4ABD-9B42-619A06C5041F} {2EB07C98-0F3F-4CB6-B448-099770AF1989} = {2EB07C98-0F3F-4CB6-B448-099770AF1989} {B6757299-D2DD-4103-834D-45227AC13CB7} = {B6757299-D2DD-4103-834D-45227AC13CB7} {3B8C289D-FF47-4237-AD7B-0702230F41A3} = {3B8C289D-FF47-4237-AD7B-0702230F41A3} @@ -55,6 +57,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minipath", "minipath\minipa {6503214A-CE25-45B5-84BB-61EEFB35D1A9} = {6503214A-CE25-45B5-84BB-61EEFB35D1A9} {DA372A4B-7AE0-4C50-97B7-49D5FF953325} = {DA372A4B-7AE0-4C50-97B7-49D5FF953325} {FF993C51-06FB-461A-9780-FE57BF498155} = {FF993C51-06FB-461A-9780-FE57BF498155} + {1F757558-0E57-4DE5-82D6-A14E9D81F05F} = {1F757558-0E57-4DE5-82D6-A14E9D81F05F} {8CA91C67-2C5E-4983-8EA1-AF4675211A2C} = {8CA91C67-2C5E-4983-8EA1-AF4675211A2C} {3E19AA6A-0935-4320-962A-C1E9378B387C} = {3E19AA6A-0935-4320-962A-C1E9378B387C} {18CD506D-5596-4B58-B868-57FAAC657C6B} = {18CD506D-5596-4B58-B868-57FAAC657C6B} @@ -62,6 +65,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minipath", "minipath\minipa {53DB2F85-DEEA-4FC0-A89F-1DF5B534A250} = {53DB2F85-DEEA-4FC0-A89F-1DF5B534A250} {39D75486-E269-4640-97BF-04DAC9209AD8} = {39D75486-E269-4640-97BF-04DAC9209AD8} {8346318F-632A-4514-AAD7-A93593759823} = {8346318F-632A-4514-AAD7-A93593759823} + {0873B090-7FFD-4ABD-9B42-619A06C5041F} = {0873B090-7FFD-4ABD-9B42-619A06C5041F} {BF3DEE96-735B-4A5E-95DD-3D3661B62EEF} = {BF3DEE96-735B-4A5E-95DD-3D3661B62EEF} {E0DEC59F-D155-46D8-8866-9F305CC75A2B} = {E0DEC59F-D155-46D8-8866-9F305CC75A2B} {BA9900A1-6FB6-4A6E-A817-830CB6F3D009} = {BA9900A1-6FB6-4A6E-A817-830CB6F3D009} diff --git a/Versions/day.txt b/Versions/day.txt index ecdb865e1..1b6d75c84 100644 --- a/Versions/day.txt +++ b/Versions/day.txt @@ -1 +1 @@ -1112 +1115 diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index 00f2ccf35..0a67c1f4d 100644 --- a/res/Notepad3.exe.manifest.conf +++ b/res/Notepad3.exe.manifest.conf @@ -3,7 +3,7 @@ Notepad3 rc diff --git a/src/VersionEx.h b/src/VersionEx.h index 51e2d80dc..c256a7516 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -8,7 +8,7 @@ #define SAPPNAME "Notepad3" #define VERSION_MAJOR 5 #define VERSION_MINOR 21 -#define VERSION_REV 1112 +#define VERSION_REV 1115 #define VERSION_BUILD 1 #define SCINTILLA_VER 511 #define LEXILLA_VER 511