From 92d0307f9dc846b8eae8336255083d390f511cc7 Mon Sep 17 00:00:00 2001 From: Rainer Kottenhoff Date: Fri, 24 Nov 2017 10:43:08 +0100 Subject: [PATCH 01/10] +fix: revert to Scintilla's default mouse down and mouse wheel capture mode --- src/Edit.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/Edit.c b/src/Edit.c index c59856366..93f7a555c 100644 --- a/src/Edit.c +++ b/src/Edit.c @@ -163,8 +163,6 @@ HWND EditCreate(HWND hwndParent) SendMessage(hwnd,SCI_SETADDITIONALSELECTIONTYPING,FALSE,0); SendMessage(hwnd,SCI_SETADDITIONALCARETSBLINK,FALSE,0); SendMessage(hwnd,SCI_SETADDITIONALCARETSVISIBLE,FALSE,0); - SendMessage(hwnd,SCI_SETMOUSEDOWNCAPTURES, FALSE, 0); - SendMessage(hwnd,SCI_SETMOUSEWHEELCAPTURES,FALSE, 0); SendMessage(hwnd,SCI_SETVIRTUALSPACEOPTIONS, (bDenyVirtualSpaceAccess ? SCVS_NONE : SCVS_RECTANGULARSELECTION), 0); SendMessage(hwnd,SCI_ASSIGNCMDKEY,(SCK_NEXT + (SCMOD_CTRL << 16)),SCI_PARADOWN); From 362972c6b7cbb2ffe9641be77c0f1ff7a87470cd Mon Sep 17 00:00:00 2001 From: Derick Payne Date: Fri, 24 Nov 2017 17:03:18 +0200 Subject: [PATCH 02/10] Preparing version 3.17.112493 --- Version.ps1 | 2 +- Versions/build.txt | 2 +- distrib/Changes.txt | 60 +++++++++++++++++++++++++++++++++- res/Notepad3.exe.manifest.conf | 2 +- src/VersionEx.h | 6 ++-- 5 files changed, 65 insertions(+), 7 deletions(-) diff --git a/Version.ps1 b/Version.ps1 index d31f6f9f2..f0ef4075d 100644 --- a/Version.ps1 +++ b/Version.ps1 @@ -31,7 +31,7 @@ function DebugOutput($msg) try { - $Major = 2 + $Major = 3 $Minor = [int]$(Get-Date -format yy) $Revis = [int]$(Get-Date -format Mdd) if ($AppVeyorEnv) { diff --git a/Versions/build.txt b/Versions/build.txt index 25b3fa08e..2034434e4 100644 --- a/Versions/build.txt +++ b/Versions/build.txt @@ -1 +1 @@ -674 +693 diff --git a/distrib/Changes.txt b/distrib/Changes.txt index 17eb2fafa..db3b70ca2 100644 --- a/distrib/Changes.txt +++ b/distrib/Changes.txt @@ -3,7 +3,65 @@ Rizonesoft Notepad3 CHANGES ================================================== -------------------------------------------------- -Version 2.17.1023.632 (16 October 2017) +Version 3.17.1124.690 (24 November 2017) +-------------------------------------------------- +- Minor bug fixes and more... +- Fix: Revert to Scintilla's default mouse down and mouse wheel capture mode. +- Fix: "Mark All Occurrences" setting of find/replace dialog should only be persisted, if "Save Settings on Exit" is enabled. +- Fix: UpdateLineNumberWidth() triggers cleanup. +- Adapt: C/C++ styles - keyword vs. typedefs. +- Fix: Issue with update of line number margin width. +- Fix: Transform backslash issues. + Fix: C/C++ keywords and types. + Timer call for mark occurrences during find/replace. +- Fix: lookaround regex (DeelX) matches were not replaced. +- Optimized DeelX regex interface. +- Fix: Issue regarding find/replace empty-string. +- Fix: Adapt DeelX RE interface according to enhanced find/replace dialog. +- Fix: Issue #173 - regex/wildcard search: replacement string not used if "Check All Occurrences" is active. +- Changed SDK version target to 10.0.16299.0 +- Feature: find/replace mark occurrences. +- Feature: Indicator in find text box, if search string is matched in document. +- Feature: validate regexpr. +- Fix: Recoding minipath's version.h to UTF-8 (Sig), because it contains codepage dependant copyright sign. +- Fix: Corrections to .vcproj settings inconsistencies (reported in release build process). +- Feature: Auto remember bookmarks in recent file history. +- Fix: undo/redo issues (if no selection choosen). +- Fix: Consecutive DEL/BACKSP undo/redo broken (wrapped by unconditional selection undo/redo). +- Feature: Mark occurrences coloring is now configurable via "Customize Schemes...". +- Fix: Issues found by static code analysis. +- Minor fix for DeelX RegEx engine. +- Major refactoring of find/replace regex evaluation. +- Fix: Bug in getting string length from dialog box readout. +- New "D" and "Go" programming language support. +- Update: Scintilla Lib v.4.0.2 (402). +- Fix: Break criteria for "replace all in range". +- Fix: Issues found regarding zero-length matches using regex anchors, including infinite loops on replace all. +- Fix: RegEx start anchor adjustment. +- Enhance: comments with useful web links. +- Fix: Problem with regex line start and replacements at line end. +- Move position after replacement (EditReplace()). +- Refactoring of "Replace All" methods. +- Split C++ Keywords in two parts (1st: standard keywords, 2nd: keywords starting with double underscore "__xxx"). +- Minor polish of Readme.md. + Put changes compared to Notepad2-mod into Readme.md. +- Repair empty resource file (Notepad3.rc). +- Bookmark Enhancements +- Swap text fields in Find/Replace dialog. +- Fix: Issues regarding selection undo/redo. +- Fix: Issues regarding margins configuration. +- Added Book Mark style (Color Background and Alpha) to customize schemes... +- Replaced old bookmark pixmap (visible margin) by Scintilla's BOOKMARK marker style. +- Update: Compiler version detection. +- Feature: "Swap Strings" button in Find/Replace dialog. +- Fix: Issue #139 and #143 (remove selection undo/redo for non-text-changing operations on selections). +- Fix: issue #144 (Left arrow no longer moves to previous line). +- Fix: issue #145 (Mark Occurrences Counter is broken). +- Increase buffers for edit box in "Customize Schemes..." dialog. +- Fix: Pasting clipboard content into selection box should replace text and cancel selection then. + +-------------------------------------------------- +Version 2.17.1023.632 (23 October 2017) -------------------------------------------------- ~ Fix: pasting clipboard content into selection box should replace text and cancel selection then (in case of swapping clipboard, the selection is preserved). diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index 5a17295b0..df9030bbc 100644 --- a/res/Notepad3.exe.manifest.conf +++ b/res/Notepad3.exe.manifest.conf @@ -3,7 +3,7 @@ Notepad3 diff --git a/src/VersionEx.h b/src/VersionEx.h index ab79ed6cf..25d46a79d 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -1,5 +1,5 @@ -#define VERSION_MAJOR 2 +#define VERSION_MAJOR 3 #define VERSION_MINOR 17 -#define VERSION_REV 1116 -#define VERSION_BUILD 674 +#define VERSION_REV 1124 +#define VERSION_BUILD 693 #define SCINTILLA_VER 402 From 4a3a9a76d625fa6cdfd4181f5f86dcee25e72504 Mon Sep 17 00:00:00 2001 From: Derick Payne Date: Fri, 24 Nov 2017 19:09:00 +0200 Subject: [PATCH 03/10] Prepared version 3.17.1124.693 --- Version.ps1 | 1 - Versions/Notepad3.exe.manifest.tpl | 1 + Versions/build.txt | 1 + distrib/Changes.txt | 2 +- src/VersionEx.h | 1 + 5 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Version.ps1 b/Version.ps1 index f0ef4075d..73e6c62a1 100644 --- a/Version.ps1 +++ b/Version.ps1 @@ -74,4 +74,3 @@ finally Write-Host "VersionPatching: Done! Elapsed time: $($stopwatch.Elapsed)." Exit $LastExitCode } - diff --git a/Versions/Notepad3.exe.manifest.tpl b/Versions/Notepad3.exe.manifest.tpl index d9d81b152..ebf3fb721 100644 --- a/Versions/Notepad3.exe.manifest.tpl +++ b/Versions/Notepad3.exe.manifest.tpl @@ -8,3 +8,4 @@ /> Notepad3 + diff --git a/Versions/build.txt b/Versions/build.txt index 2034434e4..695e52ab1 100644 --- a/Versions/build.txt +++ b/Versions/build.txt @@ -1 +1,2 @@ 693 + diff --git a/distrib/Changes.txt b/distrib/Changes.txt index db3b70ca2..9549ac268 100644 --- a/distrib/Changes.txt +++ b/distrib/Changes.txt @@ -5,7 +5,6 @@ Rizonesoft Notepad3 CHANGES -------------------------------------------------- Version 3.17.1124.690 (24 November 2017) -------------------------------------------------- -- Minor bug fixes and more... - Fix: Revert to Scintilla's default mouse down and mouse wheel capture mode. - Fix: "Mark All Occurrences" setting of find/replace dialog should only be persisted, if "Save Settings on Exit" is enabled. - Fix: UpdateLineNumberWidth() triggers cleanup. @@ -59,6 +58,7 @@ Version 3.17.1124.690 (24 November 2017) - Fix: issue #145 (Mark Occurrences Counter is broken). - Increase buffers for edit box in "Customize Schemes..." dialog. - Fix: Pasting clipboard content into selection box should replace text and cancel selection then. +- Minor bug fixes and more... -------------------------------------------------- Version 2.17.1023.632 (23 October 2017) diff --git a/src/VersionEx.h b/src/VersionEx.h index 25d46a79d..2dbc95a88 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -3,3 +3,4 @@ #define VERSION_REV 1124 #define VERSION_BUILD 693 #define SCINTILLA_VER 402 + From 2ef05a5cb093fe43e51e0f306bebb416afd99712 Mon Sep 17 00:00:00 2001 From: Derick Payne Date: Fri, 24 Nov 2017 19:12:31 +0200 Subject: [PATCH 04/10] Prepared version 3.17.1124.693 --- Versions/build.txt | 3 +-- res/Notepad3.exe.manifest.conf | 3 ++- src/VersionEx.h | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Versions/build.txt b/Versions/build.txt index 695e52ab1..d00491fd7 100644 --- a/Versions/build.txt +++ b/Versions/build.txt @@ -1,2 +1 @@ -693 - +1 diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index df9030bbc..6eadd0e5a 100644 --- a/res/Notepad3.exe.manifest.conf +++ b/res/Notepad3.exe.manifest.conf @@ -3,8 +3,9 @@ Notepad3 + diff --git a/src/VersionEx.h b/src/VersionEx.h index 2dbc95a88..3da556cac 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -1,6 +1,5 @@ #define VERSION_MAJOR 3 #define VERSION_MINOR 17 #define VERSION_REV 1124 -#define VERSION_BUILD 693 +#define VERSION_BUILD 1 #define SCINTILLA_VER 402 - From fe8c776a90ebaa63ffc1412f452c56fc5ffea7c0 Mon Sep 17 00:00:00 2001 From: Derick Payne Date: Fri, 24 Nov 2017 19:16:52 +0200 Subject: [PATCH 05/10] Version 3.17.1124.693 --- Version.ps1 | 1 + Versions/Notepad3.exe.manifest.tpl | 1 - Versions/build.txt | 2 +- res/Notepad3.exe.manifest.conf | 3 +-- src/VersionEx.h | 2 +- 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Version.ps1 b/Version.ps1 index 73e6c62a1..f0ef4075d 100644 --- a/Version.ps1 +++ b/Version.ps1 @@ -74,3 +74,4 @@ finally Write-Host "VersionPatching: Done! Elapsed time: $($stopwatch.Elapsed)." Exit $LastExitCode } + diff --git a/Versions/Notepad3.exe.manifest.tpl b/Versions/Notepad3.exe.manifest.tpl index ebf3fb721..d9d81b152 100644 --- a/Versions/Notepad3.exe.manifest.tpl +++ b/Versions/Notepad3.exe.manifest.tpl @@ -8,4 +8,3 @@ /> Notepad3 - diff --git a/Versions/build.txt b/Versions/build.txt index d00491fd7..2034434e4 100644 --- a/Versions/build.txt +++ b/Versions/build.txt @@ -1 +1 @@ -1 +693 diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index 6eadd0e5a..df9030bbc 100644 --- a/res/Notepad3.exe.manifest.conf +++ b/res/Notepad3.exe.manifest.conf @@ -3,9 +3,8 @@ Notepad3 - diff --git a/src/VersionEx.h b/src/VersionEx.h index 3da556cac..25d46a79d 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -1,5 +1,5 @@ #define VERSION_MAJOR 3 #define VERSION_MINOR 17 #define VERSION_REV 1124 -#define VERSION_BUILD 1 +#define VERSION_BUILD 693 #define SCINTILLA_VER 402 From 0be2c887d5e2fc8eadcf06fce3cc711fd47ddac8 Mon Sep 17 00:00:00 2001 From: Derick Payne Date: Fri, 24 Nov 2017 21:02:36 +0200 Subject: [PATCH 06/10] Fixing build failing. --- Version.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Version.ps1 b/Version.ps1 index f0ef4075d..d31f6f9f2 100644 --- a/Version.ps1 +++ b/Version.ps1 @@ -31,7 +31,7 @@ function DebugOutput($msg) try { - $Major = 3 + $Major = 2 $Minor = [int]$(Get-Date -format yy) $Revis = [int]$(Get-Date -format Mdd) if ($AppVeyorEnv) { From 224c4cf95ab5ed9a13fbf83c3e359494c49343b6 Mon Sep 17 00:00:00 2001 From: Derick Payne Date: Fri, 24 Nov 2017 21:03:42 +0200 Subject: [PATCH 07/10] Trying to fix build errors. :( --- Versions/build.txt | 2 +- res/Notepad3.exe.manifest.conf | 2 +- src/VersionEx.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Versions/build.txt b/Versions/build.txt index 2034434e4..8a903914e 100644 --- a/Versions/build.txt +++ b/Versions/build.txt @@ -1 +1 @@ -693 +694 diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index df9030bbc..b1137e0b4 100644 --- a/res/Notepad3.exe.manifest.conf +++ b/res/Notepad3.exe.manifest.conf @@ -3,7 +3,7 @@ Notepad3 diff --git a/src/VersionEx.h b/src/VersionEx.h index 25d46a79d..8084189c5 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -1,5 +1,5 @@ -#define VERSION_MAJOR 3 +#define VERSION_MAJOR 2 #define VERSION_MINOR 17 #define VERSION_REV 1124 -#define VERSION_BUILD 693 +#define VERSION_BUILD 694 #define SCINTILLA_VER 402 From 2bc0eb86841ead54590c4cb2757becb707c8a364 Mon Sep 17 00:00:00 2001 From: Derick Payne Date: Sat, 25 Nov 2017 19:14:51 +0200 Subject: [PATCH 08/10] Still trying to fix build failure. --- Version.ps1 | 2 +- Versions/build.txt | 2 +- res/Notepad3.exe.manifest.conf | 2 +- src/VersionEx.h | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Version.ps1 b/Version.ps1 index d31f6f9f2..f0ef4075d 100644 --- a/Version.ps1 +++ b/Version.ps1 @@ -31,7 +31,7 @@ function DebugOutput($msg) try { - $Major = 2 + $Major = 3 $Minor = [int]$(Get-Date -format yy) $Revis = [int]$(Get-Date -format Mdd) if ($AppVeyorEnv) { diff --git a/Versions/build.txt b/Versions/build.txt index 8a903914e..1e308d8d6 100644 --- a/Versions/build.txt +++ b/Versions/build.txt @@ -1 +1 @@ -694 +696 diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index b1137e0b4..2fcba3fed 100644 --- a/res/Notepad3.exe.manifest.conf +++ b/res/Notepad3.exe.manifest.conf @@ -3,7 +3,7 @@ Notepad3 diff --git a/src/VersionEx.h b/src/VersionEx.h index 8084189c5..614ec5017 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -1,5 +1,5 @@ -#define VERSION_MAJOR 2 +#define VERSION_MAJOR 3 #define VERSION_MINOR 17 -#define VERSION_REV 1124 -#define VERSION_BUILD 694 +#define VERSION_REV 1125 +#define VERSION_BUILD 696 #define SCINTILLA_VER 402 From e2b0fb301bc2e41ed6ae4315a76263293224c663 Mon Sep 17 00:00:00 2001 From: Derick Payne Date: Sat, 25 Nov 2017 19:21:50 +0200 Subject: [PATCH 09/10] Still fixing build issues. --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index c47544787..c71f7a480 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -9,7 +9,7 @@ #---------------------------------# # version format -version: 2.0.2.{build} +version: 3.0.0.{build} # you can use {branch} name in version format too # version: 1.0.{build}-{branch} From 2eeb27670023d827d33bf43ffd9208b313e0a99b Mon Sep 17 00:00:00 2001 From: Derick Payne Date: Sat, 25 Nov 2017 19:29:55 +0200 Subject: [PATCH 10/10] Still trying to fix Build errors. I think this should do it. The problem was in the TestFileVersion.cmd file. It was looking for the Major version to be 2. --- test/TestFileVersion.cmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/TestFileVersion.cmd b/test/TestFileVersion.cmd index e518f7ffe..46d9d33a3 100644 --- a/test/TestFileVersion.cmd +++ b/test/TestFileVersion.cmd @@ -14,7 +14,7 @@ set DD=00 call :GETDATE set BUILD=0 call :GETBUILD "%~1" -set VERSHOULD=2.%YY%.%MM%%DD%.%BUILD% +set VERSHOULD=3.%YY%.%MM%%DD%.%BUILD% :: --------------------------------------------------------------------------------------------------------------------