From 8b44844b470d653630bb6d451a6dadfea69205a8 Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Tue, 24 Mar 2020 17:34:58 +0100 Subject: [PATCH 1/2] + chg: Correction of a few typo's --- Build/Changes.txt | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Build/Changes.txt b/Build/Changes.txt index 34a85a0bd..5673d6bf3 100644 --- a/Build/Changes.txt +++ b/Build/Changes.txt @@ -42,9 +42,9 @@ NEW: - In About Resources: Data Sharing Service from https://workupload.com/. - Automatic scrolling when dragging selected text near window edge (SCI). - break rectangular selection into multiple selection on end-of-lines (move caret). -- Infos of sreen/display/dpi for "Copy Version Info" button. +- Infos of screen/display/dpi for "Copy Version Info" button. - Preserve stream selection in file history (w/ text position remembering). -- Language dependent status bar abreviations. +- Language dependent status bar abbreviations. - Copy directory to clipboard and Open path in explorer. - Toggle menu bar option. - Add Lexicographical Line Sort Order. @@ -57,7 +57,7 @@ CHANGES: ----------------------------------------------------- - Update "KeyboardShortcuts.txt". - Split undo typing sequence by line-breaks default -> true. -- Add file history to to recent docs (taskbar) jumplist. +- Add file history to recent docs (taskbar) jumplist. - NP3 INI file read/write using file locking (shared read / exclusive write) for multiple instances. - Reset build-of-the-day number in AppVeyor on new day. - Change version numbering of build_# (the build number is now daily based). @@ -74,13 +74,13 @@ CHANGES: - Replace std messagebox "save modified file warning" by (silent) custom messagebox if message beeps are muted. - Don't Auto-Close blank untitled document, only empty untitled document. - Encoding detection fallback: if "Load ASCII as UTF-8" is checked use UTF-8 (if valid) else current ANSI code-page. -- Use Ctrl+Shift+L for toggle "Menu: Reuse Window" option. +- Use Ctrl+Shift+L for toggle "Menu: Reuse Window" option. - Inversion of Accelerator key Ctrl+Alt+L with Ctrl+Shift+L. - Change wording "Administrator" to "Elevated". - Hidden "ExitOnESCSkipLevel" feature (Exit on ESC can ignore a selection). - ESC Key clears active selection (not exiting Notepad3 if configured) (Config: ExitOnESCSkipLevel=2). - Set large file size limit to 2GB (INT32_MAX). -- Set big file size limit warning to 64MB (syntax highlighting is switched off) (Config: FileLoadWarningMB=64). +- Set big file size limit warning to 64MB (syntax highlighting is switched off) (Config: FileLoadWarningMB=64). - New Notepad3 Icon (Notepad3 icon by Vexels.com designed by smanashova@gmail.com). - Initial default big toolbar only for monitors > Full-HD. - Copy to clipboard instead of insert (filename, path, GUID). @@ -88,9 +88,9 @@ CHANGES: - Option [Settings2] LineCommentPortfixStrg= e.g. add a space to comment chars. - Option [Settings2] NoCopyLineOnEmptySelection and NoCutLineOnEmptySelection. - Appearance of INFOBOX4 (MB_YESNOCANCEL). -- Thin rectangular (multi) selection after toggeling line-comment block for multi insertion. +- Thin rectangular (multi) selection after toggling line-comment block for multi insertion. - Full Work Area Mode (F11) -> Full Screen Mode (Maximize window if "full work area" is requested). -- Ctrl+Alt+Enter AutoCompletion behaviour. +- Ctrl+Alt+Enter AutoCompletion behavior. - Menu and behavior for copy/paste and copy/paste line. - Allow each modification step to split undo typing sequence (set timeout 0 < to < 20ms). - Split undo typing sequence (by line-breaks and/or timeout) (UndoTransactionTimeout=0, LnBrk via Menu). @@ -116,12 +116,12 @@ ENHANCEMENT: FIXES: ----------------------------------------------------- - Don't use analysis hint UTF-8, if file is invalid UTF-8. -- Configurable default ANSI code-page (locale) detection bonus. +- Configurable default ANSI code-page (locale) detection bonus. - No AutoCompletion on empty words (busy loop bug). - DPI Scaling Toolbar and DPI scaling selection mode. -- Common controls will use preffered/available MUI language. +- Common controls will use preferred/available MUI language. - Sticky window position handling. -- Initial, default and current window position handling. +- Initial, default and current window position handling. - Debug assertion (isspace() called on non ASCII char). - Correct return result of Styles export. - Scintilla method declaration. @@ -167,13 +167,13 @@ FIXES: - Batch lexer: handle comment after ampersand(&) command sequence. - Bug in replace on single step find/replace. - Convert to Hex and vice versa: work on (stream-)selection (original source by ZuFuLiu). -- Comparison warning: signed/unsignd mismatch. +- Comparison warning: signed/unsigned mismatch. - Canonical ini-file style section order for settings from scratch. - Prevent concurrent settings-file-access (re-launch elevated). - Small fixes on "Relaunch Elevated" functionality. - Minor fixes for window positioning by cmdline parameter. - Minor correction of HotKey. -- Ctrl+Shift-C/X and Paste behaviour. +- Ctrl+Shift-C/X and Paste behavior. - Markdown highlight overflow. - Redo initial selection after replace (ins/del). - Hyperlink Regex detection and Update visible indicator issue. From 97b97c54f03f50267b6852156c6a191bb6513f91 Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Wed, 25 Mar 2020 05:12:20 +0100 Subject: [PATCH 2/2] +ver: VS2019 version update - VS 16.5.1 --- Versions/day.txt | 2 +- res/Notepad3.exe.manifest.conf | 2 +- src/Version.h | 4 +++- src/VersionEx.h | 4 ++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Versions/day.txt b/Versions/day.txt index 3860ed913..6ac793b42 100644 --- a/Versions/day.txt +++ b/Versions/day.txt @@ -1 +1 @@ -323 +325 diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index 0033faec5..95aea9d61 100644 --- a/res/Notepad3.exe.manifest.conf +++ b/res/Notepad3.exe.manifest.conf @@ -3,7 +3,7 @@ Notepad3 RC3 diff --git a/src/Version.h b/src/Version.h index a0d7422b2..2d8450d82 100644 --- a/src/Version.h +++ b/src/Version.h @@ -74,7 +74,9 @@ #if defined(_MSC_VER) #if (_MSC_VER == 1925) - #if(_MSC_FULL_VER >= 192528610) + #if(_MSC_FULL_VER >= 192528611) + #define VER_CPL MS Visual C++ 2019 v16.5.1 + #elif(_MSC_FULL_VER >= 192528610) #define VER_CPL MS Visual C++ 2019 v16.5.0 #endif #elif (_MSC_VER == 1924) diff --git a/src/VersionEx.h b/src/VersionEx.h index 9e53113f8..62069b001 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -8,7 +8,7 @@ #define SAPPNAME "Notepad3" #define VERSION_MAJOR 5 #define VERSION_MINOR 20 -#define VERSION_REV 323 +#define VERSION_REV 325 #define VERSION_BUILD 1 #define SCINTILLA_VER 432 #define ONIGURUMA_REGEX_VER 6.9.4 @@ -16,4 +16,4 @@ #define TINYEXPR_VER 2018.05.11 #define UTHASH_VER 2.1.0 #define VERSION_PATCH RC3 -#define VERSION_COMMIT_ID t7820-rk +#define VERSION_COMMIT_ID dkt1-amr