Merge remote-tracking branch 'notepad3_orig_rizone/master'

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) {

Versions/build.txt

@@ -1 +1 @@
-674
+696

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}

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)
+--------------------------------------------------
+- 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.
+- Minor bug fixes and more...
+
+--------------------------------------------------
+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).

res/Notepad3.exe.manifest.conf

@@ -3,7 +3,7 @@
   <assemblyIdentity
     name="Notepad3"
     processorArchitecture="*"
-    version="2.17.1116.674"
+    version="3.17.1125.696"
     type="win32"
   />
   <description>Notepad3</description>

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);

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 1125
+#define VERSION_BUILD 696
 #define SCINTILLA_VER 402

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%
 
 :: --------------------------------------------------------------------------------------------------------------------