+ fix: regression with undo/redo char sequence

This commit is contained in:
Rainer Kottenhoff 2019-07-15 13:21:19 +02:00
parent c61fae70fa
commit 2a063d33fe
4 changed files with 5 additions and 7 deletions

View File

@ -1 +1 @@
2392
2393

View File

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

View File

@ -3832,14 +3832,12 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
case IDM_EDIT_UNDO:
if (SciCall_CanUndo()) {
SciCall_Undo();
UpdateToolbar();
}
break;
case IDM_EDIT_REDO:
if (SciCall_CanRedo()) {
SciCall_Redo();
UpdateToolbar();
}
break;
@ -7013,7 +7011,7 @@ static LRESULT _MsgNotifyFromEdit(HWND hwnd, const LPNMHDR pnmh, const SCNotific
bool bModified = true;
if ((iModType & SC_MOD_BEFOREINSERT) || ((iModType & SC_MOD_BEFOREDELETE))) {
if (!((iModType & SC_PERFORMED_UNDO) || (iModType & SC_PERFORMED_REDO))) {
if (!_InUndoRedoTransaction()) {
if ((!_InUndoRedoTransaction() && !SciCall_IsSelectionEmpty()) || Sci_IsMultiOrRectangleSelection()) {
_SaveRedoSelection(_SaveUndoSelection());
}
}

View File

@ -7,8 +7,8 @@
#define SAPPNAME "Notepad3"
#define VERSION_MAJOR 5
#define VERSION_MINOR 19
#define VERSION_REV 714
#define VERSION_BUILD 2392
#define VERSION_REV 715
#define VERSION_BUILD 2393
#define SCINTILLA_VER 420
#define ONIGURUMA_REGEX_VER 6.9.3
#define VERSION_PATCH BETA