diff --git a/Versions/day.txt b/Versions/day.txt index 55a98c62c..db01d14d8 100644 --- a/Versions/day.txt +++ b/Versions/day.txt @@ -1 +1 @@ -722 +723 diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index 7617db3e2..f750bf082 100644 --- a/res/Notepad3.exe.manifest.conf +++ b/res/Notepad3.exe.manifest.conf @@ -3,7 +3,7 @@ Notepad3 BETA diff --git a/src/Notepad3.c b/src/Notepad3.c index 8c8eae88d..43a0c7cf4 100644 --- a/src/Notepad3.c +++ b/src/Notepad3.c @@ -5569,19 +5569,21 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam) --skipLevel; } else if (s_bInMultiEditMode) { - _BEGIN_UNDO_ACTION_; + //~_BEGIN_UNDO_ACTION_; SciCall_SetIndicatorCurrent(INDIC_NP3_MULTI_EDIT); SciCall_IndicatorClearRange(0, Sci_GetDocEndPosition()); SciCall_ClearSelections(); - _END_UNDO_ACTION_; + //~_END_UNDO_ACTION_; SciCall_GotoPos(iCurPos); s_bInMultiEditMode = false; --skipLevel; } if ((!SciCall_IsSelectionEmpty() || Sci_IsMultiOrRectangleSelection()) && (skipLevel == Settings2.ExitOnESCSkipLevel)) { + //~_BEGIN_UNDO_ACTION_; SciCall_GotoPos(iCurPos); SciCall_ChooseCaretX(); + //~_END_UNDO_ACTION_; skipLevel -= Defaults2.ExitOnESCSkipLevel; } @@ -5593,7 +5595,7 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam) break; case 2: - CloseApplication(true); + CloseApplication(); break; default: @@ -5602,9 +5604,7 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam) break; } } - _BEGIN_UNDO_ACTION_; SciCall_Cancel(); - _END_UNDO_ACTION_; } break; diff --git a/src/VersionEx.h b/src/VersionEx.h index 4749ba1c2..f3fbc4c8f 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 722 +#define VERSION_REV 723 #define VERSION_BUILD 2 #define SCINTILLA_VER 443 #define ONIGURUMA_REGEX_VER 6.9.5 @@ -16,4 +16,4 @@ #define TINYEXPR_VER 2018.05.11 #define UTHASH_VER 2.1.0 #define VERSION_PATCH BETA -#define VERSION_COMMIT_ID dkt1-amr +#define VERSION_COMMIT_ID t7820-rk