CodeCow/Notepad3
1
0
Fork 0
mirror of https://github.com/rizonesoft/Notepad3.git synced 2026-06-14 21:09:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

+ fix: clear selection by ESC should not populate undo/redo stack

Browse Source
This commit is contained in:
RaiKoHoff 2020-07-23 18:25:24 +02:00
parent 72d9e4aa81
commit 19d8899fc7
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Versions/day.txt
View File

@ -1 +1 @@
722
723

2
res/Notepad3.exe.manifest.conf
View File

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

10
src/Notepad3.c
View File

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

4
src/VersionEx.h
View File

@ -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