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 1 Packages Projects Releases Wiki Activity

Merge pull request #2027 from RaiKoHoff/RC2_DEV

Browse Source 
Fixed: drag&drop rectangular selection shuffles chars
This commit is contained in:
Rainer Kottenhoff 2020-02-27 16:07:57 +01:00 committed by GitHub
commit f6dec21782
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Versions/build.txt
View File

@ -1 +1 @@
3
4

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

@ -3,7 +3,7 @@
<assemblyIdentity
name="Notepad3"
processorArchitecture="*"
version="5.20.227.3"
version="5.20.227.4"
type="win32"
/>
<description>Notepad3 RC2</description>

12
src/Notepad3.c
View File

@ -7046,11 +7046,7 @@ inline static LRESULT _MsgNotifyLean(const LPNMHDR pnmh, const SCNotification* c
if ((iModType & SC_MOD_BEFOREINSERT) || ((iModType & SC_MOD_BEFOREDELETE))) {
if (!((iModType & SC_PERFORMED_UNDO) || (iModType & SC_PERFORMED_REDO))) {
if ((!_InUndoRedoTransaction() && !SciCall_IsSelectionEmpty()) || Sci_IsMultiOrRectangleSelection()) {
int const token = _SaveUndoSelection();
if (!Sci_IsMultiOrRectangleSelection()) {
SciCall_ReplaceSel("");
}
_SaveRedoSelection(token);
_SaveRedoSelection(_SaveUndoSelection());
}
}
bModified = false; // not yet
@ -7145,11 +7141,7 @@ static LRESULT _MsgNotifyFromEdit(HWND hwnd, const LPNMHDR pnmh, const SCNotific
if ((iModType & SC_MOD_BEFOREINSERT) || ((iModType & SC_MOD_BEFOREDELETE))) {
if (!((iModType & SC_PERFORMED_UNDO) || (iModType & SC_PERFORMED_REDO))) {
if ((!_InUndoRedoTransaction() && !SciCall_IsSelectionEmpty()) || Sci_IsMultiOrRectangleSelection()) {
int const token = _SaveUndoSelection();
if (!Sci_IsMultiOrRectangleSelection()) {
SciCall_ReplaceSel("");
}
_SaveRedoSelection(token);
_SaveRedoSelection(_SaveUndoSelection());
}
}
bModified = false; // not yet

2
src/VersionEx.h
View File

@ -9,7 +9,7 @@
#define VERSION_MAJOR 5
#define VERSION_MINOR 20
#define VERSION_REV 227
#define VERSION_BUILD 3
#define VERSION_BUILD 4
#define SCINTILLA_VER 430
#define ONIGURUMA_REGEX_VER 6.9.4
#define UCHARDET_VER 2018.09.27