diff --git a/Build/Changes.txt b/Build/Changes.txt index be2d06db4..cfe3cd621 100644 --- a/Build/Changes.txt +++ b/Build/Changes.txt @@ -34,13 +34,14 @@ SUP - (S)et(UP) / Installer Package ======================================================== -Current BETA/RC Version 5.20.1006.(build_#) (2020-10-06) +Current BETA/RC Version 5.20.1012.(build_#) (2020-10-12) ======================================================== -------------------------------------------------------- NEW: -------------------------------------------------------- [.xxx.x]- . +[1012.1]- Support for Windows 10 20H2 Version 2009 (Build 19042). [1004.1]- Open/Save file explorer dialog: populate file filter with current lexer supported file extensions. [.929.1]- Minipath.ini: [Settings2] FocusLostOpacity=100 (opycity level on losing focus). [.923.1]- Hotkey 'F3': use MRU latest item before clipboard content as search pattern if prior search pattern is empty. @@ -83,16 +84,20 @@ CHANGES: [.915.3]- Due to lack of interest, "Notepad3DLL" is discontinued. [.915.2]- User configurable "Web Action" menu item names. [.921.1]- Update grepWinNP3 (GRE) version 2.1.4.30 (2020-09-21). -[.921.1]- Update Oniguruma Regex (ONI) engine version 6.9.5 revised 1 (2020-09-21). +[1012.1]- Update Oniguruma Regex (ONI) engine version 6.9.6 (2020-10-09). [.915.3]- Update Scintilla Library (SCI) version 4.4.5 (2020-09-11). -------------------------------------------------------- FIXES: -------------------------------------------------------- [.xxx.x]- . +[1012.1]- Find/Repl all in range algo. +[1012.1]- Oniguruma flexible EOL handling (Win CRLF, Unix LF and Mac CR) (ONI). +[1012.1]- Replace all in range. +[1012.1]- Avoid file cache lost on power failure. [1006.1]- Copy/Cut/Delete "Focused View" lines (clipboard). [1006.1]- Cut/cop occurrences marker line(s) if marker in first line. -[1004.1]- Initial directory for open/save file explorer dlg. +[1004.1]- Initial directory for open/save file Explorer dialog. [1001.1]- TOML Lexer performance leak. [.928.2]- Freezing of main window caused by mixed usage of Lexer Interfaces. [.928.1]- Setting new IFace5 Lexer (should fix line/stream comment toggle issue #2912). diff --git a/Build/Docs/Notepad3.txt b/Build/Docs/Notepad3.txt index ddbf0595a..87ff371e3 100644 --- a/Build/Docs/Notepad3.txt +++ b/Build/Docs/Notepad3.txt @@ -12,7 +12,7 @@ = based on: = = Notepad2 4.2.25 = = (c) Florian Balmer 2004-2011 = -= http://www.flos-freeware.ch = += https://www.flos-freeware.ch = = = = = ======================================================================= @@ -67,7 +67,7 @@ Supported Operating Systems Contributors: - - Florian Balmer http://www.flos-freeware.ch + - Florian Balmer https://www.flos-freeware.ch - XhmikosR https://xhmikosr.github.io/notepad2-mod - Kai Liu https://code.kliu.org/misc/notepad2 - RL Vision https://www.rlvision.com/notepad2/about.php @@ -80,7 +80,7 @@ More information: * Binaries: https://www.rizonesoft.com/downloads/notepad3 * Source code: https://github.com/rizonesoft/Notepad3 * https://github.com/XhmikosR/notepad2-mod -* Official Notepad2 website: http://www.flos-freeware.ch/notepad2.html +* Official Notepad2 website: https://www.flos-freeware.ch/notepad2.html * Code folding usage guide: https://github.com/XhmikosR/notepad2-mod/wiki/Code-Folding-Usage * Kai Liu's website: https://code.kliu.org/misc/notepad2 * Bookmark Edition website: https://www.rlvision.com/notepad2/about.asp @@ -519,7 +519,7 @@ purpose. = = = Notepad2 4.2.25 = = (c) Florian Balmer 2004-2011 = -= http://www.flos-freeware.ch = += https://www.flos-freeware.ch = = = = = ======================================================================= @@ -925,7 +925,7 @@ Source Code https://www.scintilla.org The full Notepad2 source code can be found at: - http://www.flos-freeware.ch + https://www.flos-freeware.ch More Information and Resources @@ -933,7 +933,7 @@ More Information and Resources For more information on Notepad2 features, how to replace Windows Notepad, and answers to the most frequently asked questions (FAQ), please visit the Notepad2 website: - http://www.flos-freeware.ch + https://www.flos-freeware.ch Feature Requests diff --git a/Build/notepad3_setup.iss b/Build/notepad3_setup.iss index 94c73f674..3fa8e14e5 100644 --- a/Build/notepad3_setup.iss +++ b/Build/notepad3_setup.iss @@ -3,7 +3,7 @@ ;* (c) Rizonesoft 2008-2020 ; Requirements: -; Inno Setup: http://www.jrsoftware.org/isdl.php +; Inno Setup: https://www.jrsoftware.org/isdl.php ; Preprocessor related stuff #if VER < EncodeVer(6,0,2) diff --git a/Build/notepad3_x86_setup.iss b/Build/notepad3_x86_setup.iss index 327e8e93a..fc968f84f 100644 --- a/Build/notepad3_x86_setup.iss +++ b/Build/notepad3_x86_setup.iss @@ -3,7 +3,7 @@ ;* (c) Rizonesoft 2008-2020 ; Requirements: -; Inno Setup: http://www.jrsoftware.org/isdl.php +; Inno Setup: https://www.jrsoftware.org/isdl.php ; Preprocessor related stuff #if VER < EncodeVer(6,0,2) diff --git a/Notepad2.txt b/Notepad2.txt index 9f2147ccf..099a8b88e 100644 --- a/Notepad2.txt +++ b/Notepad2.txt @@ -4,7 +4,7 @@ = = = Notepad2 4.2.25 = = (c) Florian Balmer 2004-2011 = -= http://www.flos-freeware.ch = += https://www.flos-freeware.ch = = = ================================================================================ @@ -837,7 +837,7 @@ Source Code https://www.scintilla.org The full Notepad2 source code can be found at: - http://www.flos-freeware.ch + https://www.flos-freeware.ch More Information and Resources @@ -845,7 +845,7 @@ More Information and Resources For more information on Notepad2 features, how to replace Windows Notepad, and answers to the most frequently asked questions (FAQ), please visit the Notepad2 website: - http://www.flos-freeware.ch + https://www.flos-freeware.ch Feature Requests diff --git a/Readme-Notepad2.txt b/Readme-Notepad2.txt index 95faf87f4..8e26f443f 100644 --- a/Readme-Notepad2.txt +++ b/Readme-Notepad2.txt @@ -4,7 +4,7 @@ = = = Notepad2 4.2.25 = = (c) Florian Balmer 2004-2011 = -= http://www.flos-freeware.ch = += https://www.flos-freeware.ch = = = ================================================================================ @@ -66,6 +66,6 @@ Copyright florian.balmer@gmail.com (c) Florian Balmer 2004-2011 - http://www.flos-freeware.ch + https://www.flos-freeware.ch ### diff --git a/Readme-mod.txt b/Readme-mod.txt index 6fe2461f4..d69c03386 100644 --- a/Readme-mod.txt +++ b/Readme-mod.txt @@ -44,7 +44,7 @@ Contributors: More information: -------------------------------------------------- * Source code and binaries: https://github.com/XhmikosR/notepad2-mod -* Official Notepad2 website: http://www.flos-freeware.ch/notepad2.html +* Official Notepad2 website: https://www.flos-freeware.ch/notepad2.html * Code folding usage guide: https://github.com/XhmikosR/notepad2-mod/wiki/Code-Folding-Usage * Kai Liu's website: https://code.kliu.org/misc/notepad2 * Bookmark Edition website: https://www.rlvision.com/notepad2/about.asp diff --git a/Readme.md b/Readme.md index 96a3d47ff..66ffa8308 100644 --- a/Readme.md +++ b/Readme.md @@ -19,7 +19,7 @@ Notepad3 is a fast and light-weight Scintilla-based text editor with syntax high * **[GET IN TOUCH](https://www.rizonesoft.com/#contact)** * **Premium Support** - On Rizonesoft, support is free and we will assist you the best we can. Please be patient when contacting us; there are mainly volunteers working on Rizonesoft projects and time is a precious commodity. -## Changes compared to Flo's official [Notepad2](http://www.flos-freeware.ch/notepad2.html) (made in [Notepad2-mod](https://xhmikosr.github.io/notepad2-mod/)): +## Changes compared to Flo's official [Notepad2](https://www.flos-freeware.ch/notepad2.html) (made in [Notepad2-mod](https://xhmikosr.github.io/notepad2-mod/)): * Code folding * Support for bookmarks diff --git a/Readme.txt b/Readme.txt index a3940460f..d4c061452 100644 --- a/Readme.txt +++ b/Readme.txt @@ -63,7 +63,7 @@ Windows 7, 8, 8.1 and 10 both 32-bit and 64-bit -------------------------------------------------------------------------------- Development: ------------ -- Florian 'Flo' Balmer (Notepad2) http://www.flos-freeware.ch +- Florian 'Flo' Balmer (Notepad2) https://www.flos-freeware.ch - RaiKoHoff https://github.com/RaiKoHoff -------------------------------------------------------------------------------- diff --git a/Versions/day.txt b/Versions/day.txt index 9540e56f9..2d1420d53 100644 --- a/Versions/day.txt +++ b/Versions/day.txt @@ -1 +1 @@ -1006 +1012 diff --git a/minipath/Readme.txt b/minipath/Readme.txt index a6c98f617..c7cb0f26a 100644 --- a/minipath/Readme.txt +++ b/minipath/Readme.txt @@ -4,7 +4,7 @@ = = = metapath 4.0.13 = = (c) Florian Balmer 1996-2011 = -= http://www.flos-freeware.ch = += https://www.flos-freeware.ch = = = ================================================================================ @@ -36,6 +36,6 @@ Copyright florian.balmer@gmail.com (c) Florian Balmer 1996-2011 - http://www.flos-freeware.ch + https://www.flos-freeware.ch ### diff --git a/minipath/metapath.txt b/minipath/metapath.txt index 3bcb0d36a..5ea9c8b6e 100644 --- a/minipath/metapath.txt +++ b/minipath/metapath.txt @@ -6,7 +6,7 @@ = = = metapath 4.0.13 = = (c) Florian Balmer 1996-2011 = -= http://www.flos-freeware.ch = += https://www.flos-freeware.ch = = = = = ======================================================================= @@ -260,7 +260,7 @@ Tips and Tricks, Special Features Source Code The full metapath source code can be found at: - http://www.flos-freeware.ch + https://www.flos-freeware.ch Copyright diff --git a/minipath/src/Dialogs.c b/minipath/src/Dialogs.c index 3995580c9..a8e94ad6e 100644 --- a/minipath/src/Dialogs.c +++ b/minipath/src/Dialogs.c @@ -582,7 +582,7 @@ INT_PTR CALLBACK AboutDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lParam) case NM_RETURN: { if (pnmhdr->idFrom == IDC_WEBPAGE) { - ShellExecute(hwnd,L"open",L"http://www.flos-freeware.ch",NULL,NULL,SW_SHOWNORMAL); + ShellExecute(hwnd,L"open",L"https://www.flos-freeware.ch",NULL,NULL,SW_SHOWNORMAL); } else if (pnmhdr->idFrom == IDC_EMAIL) { ShellExecute(hwnd,L"open",L"mailto:florian.balmer@gmail.com",NULL,NULL,SW_SHOWNORMAL); diff --git a/minipath/src/version.h b/minipath/src/version.h index 50fabb09d..7fb4b519c 100644 --- a/minipath/src/version.h +++ b/minipath/src/version.h @@ -36,7 +36,7 @@ #define VERSION_ORIGINALFILENAME L"minipath.exe" #define VERSION_AUTHORNAME L"Florian Balmer et al. ( metapath )" #define VERSION_WEBPAGEDISPLAY L"https://www.rizonesoft.com" -#define VERSION_FBWEBPAGEDISPLAY L"http://www.flos-freeware.ch" +#define VERSION_FBWEBPAGEDISPLAY L"https://www.flos-freeware.ch" #if defined(_WIN64) #define VERSION_FILEVERSION_LONG L"MiniPath (x64) " STRINGIFY(VERSION_MAJOR) L" Build " \ diff --git a/np3portableapp/Notepad3Portable/App/AppInfo/Launcher/Notepad3Portable.ini b/np3portableapp/Notepad3Portable/App/AppInfo/Launcher/Notepad3Portable.ini index 007434e97..2dfaa0ddf 100644 --- a/np3portableapp/Notepad3Portable/App/AppInfo/Launcher/Notepad3Portable.ini +++ b/np3portableapp/Notepad3Portable/App/AppInfo/Launcher/Notepad3Portable.ini @@ -1,4 +1,4 @@ -;Full details: http://portableapps.com/manuals/PortableApps.comLauncher/ +;Full details: https://portableapps.com/manuals/PortableApps.comLauncher/ [Launch] ProgramExecutable=Notepad3\x86\Notepad3.exe ProgramExecutable64=Notepad3\x64\Notepad3.exe diff --git a/np3portableapp/Notepad3Portable/App/AppInfo/appinfo_template.ini b/np3portableapp/Notepad3Portable/App/AppInfo/appinfo_template.ini index 58cee8c56..a55039cc8 100644 --- a/np3portableapp/Notepad3Portable/App/AppInfo/appinfo_template.ini +++ b/np3portableapp/Notepad3Portable/App/AppInfo/appinfo_template.ini @@ -1,4 +1,4 @@ -;Full details on this file: http://portableapps.com/development/portableapps.com_format#appinfo +;Full details on this file: https://portableapps.com/development/portableapps.com_format#appinfo [Format] Type=PortableAppsFormat Version=3.5 @@ -46,7 +46,7 @@ FileTypes=txt,html,htm,xmp,php,asp,css,js,vb,vbs,c,cpp,h,rs,mak,java,pas,inc,bat ;FileTypeCommandLine-extension=/OpenExtension=%1 ;Protocols=http,https,gtp,gopher ;ProtocolCommandLine=--protocolhandler=%1 -;ProtocolCommandLine-protocol=--http:%1 +;ProtocolCommandLine-protocol=--https:%1 ;SendTo=true ;SendToCommandLine=-multiplefiles "%1" ;Shell=true diff --git a/np3portableapp/Notepad3Portable/Other/Source/Notepad3.nsi b/np3portableapp/Notepad3Portable/Other/Source/Notepad3.nsi index bd55e59d6..32cad683d 100644 --- a/np3portableapp/Notepad3Portable/Other/Source/Notepad3.nsi +++ b/np3portableapp/Notepad3Portable/Other/Source/Notepad3.nsi @@ -1,7 +1,7 @@ ;Copyright 2004-2016 John T. Haller of PortableApps.com ;encoding: UTF-8 -;Website: http://PortableApps.com/Notepad3Portable +;Website: https://PortableApps.com/Notepad3Portable ;This software is OSI Certified Open Source Software. ;OSI Certified is a certification mark of the Open Source Initiative. diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index 92d957344..79e596d8d 100644 --- a/res/Notepad3.exe.manifest.conf +++ b/res/Notepad3.exe.manifest.conf @@ -3,7 +3,7 @@ Notepad3 beta diff --git a/src/Helpers.c b/src/Helpers.c index bf4c55574..9ec627466 100644 --- a/src/Helpers.c +++ b/src/Helpers.c @@ -212,7 +212,10 @@ static void _GetTrueWindowsVersion() // ---------------------------------------------------------------------------- static DWORD _Win10BuildToReleaseId(DWORD build) { - if (build >= 19041) { + if (build >= 19042) { + return 2009; + } + else if (build >= 19041) { return 2004; } else if (build >= 18363) { diff --git a/src/Version.h b/src/Version.h index 5eda1028b..c413c057f 100644 --- a/src/Version.h +++ b/src/Version.h @@ -48,7 +48,7 @@ #define VERSION_WEBPAGEDISPLAY "https://www.rizonesoft.com" #define VERSION_COMPANYNAME "© Rizonesoft" //#define VERSION_MODPAGEDISPLAY "https://xhmikosr.github.io/notepad2-mod/" -//#define VERSION_WEBPAGE2DISPLAY "http://www.flos-freeware.ch" +//#define VERSION_WEBPAGE2DISPLAY "https://www.flos-freeware.ch" #ifdef _DLL #define _SCI_BUILD L"Scintilla(dll) " diff --git a/src/VersionEx.h b/src/VersionEx.h index ad709a0a1..0c5d55ab8 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -8,10 +8,10 @@ #define SAPPNAME "Notepad3" #define VERSION_MAJOR 5 #define VERSION_MINOR 20 -#define VERSION_REV 1006 +#define VERSION_REV 1012 #define VERSION_BUILD 1 #define SCINTILLA_VER 445 -#define ONIGURUMA_REGEX_VER 6.9.5 +#define ONIGURUMA_REGEX_VER 6.9.6 #define UCHARDET_VER 2018.09.27 #define TINYEXPR_VER 2018.05.11 #define UTHASH_VER 2.1.0 diff --git a/test/test_files/StyleLexers/styleLexNSIS/GeneratorWizard.nsi b/test/test_files/StyleLexers/styleLexNSIS/GeneratorWizard.nsi index 753d5fa74..bcfc2ffe5 100644 --- a/test/test_files/StyleLexers/styleLexNSIS/GeneratorWizard.nsi +++ b/test/test_files/StyleLexers/styleLexNSIS/GeneratorWizard.nsi @@ -1,5 +1,5 @@ ;Copyright 2006-2016 John T. Haller -;Website: http://PortableApps.com/ +;Website: https://PortableApps.com/ ;This software is OSI Certified Open Source Software. ;OSI Certified is a certification mark of the Open Source Initiative. diff --git a/test/test_files/StyleLexers/styleLexNSIS/PortableApps.comLauncher.nsi b/test/test_files/StyleLexers/styleLexNSIS/PortableApps.comLauncher.nsi index 260488a8f..3ffe0175e 100644 --- a/test/test_files/StyleLexers/styleLexNSIS/PortableApps.comLauncher.nsi +++ b/test/test_files/StyleLexers/styleLexNSIS/PortableApps.comLauncher.nsi @@ -1,5 +1,5 @@ /* Copyright 2004-2010 PortableApps.com - * Website: http://portableapps.com/development + * Website: https://portableapps.com/development * Main developer and contact: Chris Morgan * * This software is OSI Certified Open Source Software. diff --git a/test/test_files/StyleLexers/styleLexTEXT/TXT_Readme_01.txt b/test/test_files/StyleLexers/styleLexTEXT/TXT_Readme_01.txt index df4ea07dd..c4d400d8d 100644 --- a/test/test_files/StyleLexers/styleLexTEXT/TXT_Readme_01.txt +++ b/test/test_files/StyleLexers/styleLexTEXT/TXT_Readme_01.txt @@ -60,9 +60,9 @@ Windows 7, 8, 8.1 and 10 both 32-bit and 64-bit Contributors -------------------------------------------------------------------------------- - Rainer Kottenhoff -- Florian Balmer ( http://www.flos-freeware.ch ) -- XhmikosR ( http://xhmikosr.github.io/notepad2-mod/ ) -- Kai Liu ( http://code.kliu.org/misc/notepad2/ ) +- Florian Balmer ( https://www.flos-freeware.ch ) +- XhmikosR ( https://xhmikosr.github.io/notepad2-mod/ ) +- Kai Liu ( https://code.kliu.org/misc/notepad2/ ) - RL Vision - Aleksandar Lekov - Bruno Barbieri \ No newline at end of file diff --git a/test/test_files/StyleLexers/styleLexTEXT/TXT_Readme_02.txt b/test/test_files/StyleLexers/styleLexTEXT/TXT_Readme_02.txt index 0f01fbad9..b4a222b93 100644 --- a/test/test_files/StyleLexers/styleLexTEXT/TXT_Readme_02.txt +++ b/test/test_files/StyleLexers/styleLexTEXT/TXT_Readme_02.txt @@ -60,9 +60,9 @@ Windows 7, 8, 8.1 and 10 both 32-bit and 64-bit Contributors -------------------------------------------------------------------------------- - Rainer Kottenhoff -- Florian Balmer ( http://www.flos-freeware.ch ) -- XhmikosR ( http://xhmikosr.github.io/notepad2-mod/ ) -- Kai Liu ( http://code.kliu.org/misc/notepad2/ ) +- Florian Balmer ( https://www.flos-freeware.ch ) +- XhmikosR ( https://xhmikosr.github.io/notepad2-mod/ ) +- Kai Liu ( https://code.kliu.org/misc/notepad2/ ) - RL Vision - Aleksandar Lekov - Bruno Barbieri @@ -128,9 +128,9 @@ Windows 7, 8, 8.1 and 10 both 32-bit and 64-bit Contributors -------------------------------------------------------------------------------- - Rainer Kottenhoff -- Florian Balmer ( http://www.flos-freeware.ch ) -- XhmikosR ( http://xhmikosr.github.io/notepad2-mod/ ) -- Kai Liu ( http://code.kliu.org/misc/notepad2/ ) +- Florian Balmer ( https://www.flos-freeware.ch ) +- XhmikosR ( https://xhmikosr.github.io/notepad2-mod/ ) +- Kai Liu ( https://code.kliu.org/misc/notepad2/ ) - RL Vision - Aleksandar Lekov - Bruno Barbieri \ No newline at end of file