Merge branch 'Dev_RC2_fixes' into Dev_AccelKeys

This commit is contained in:
Rainer Kottenhoff 2018-10-30 09:11:54 +01:00
commit eb422fca80
11 changed files with 8 additions and 8 deletions

View File

@ -1 +1 @@
1310
1332

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -3,8 +3,8 @@
<assemblyIdentity
name="Notepad3"
processorArchitecture="*"
version="5.18.1009.1310"
version="5.18.1030.1332"
type="win32"
/>
<description>Notepad3 RC</description>
<description>Notepad3 RC_NewMenu</description>
</assembly>

View File

@ -3611,9 +3611,9 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
case CMD_DELETEBACK:
{
_BEGIN_UNDO_ACTION_;
///~_BEGIN_UNDO_ACTION_;
SendMessage(Globals.hwndEdit, SCI_DELETEBACK, 0, 0);
_END_UNDO_ACTION_;
///~_END_UNDO_ACTION_;
}
break;

View File

@ -6,8 +6,8 @@
#define APPNAME "Notepad3"
#define VERSION_MAJOR 5
#define VERSION_MINOR 18
#define VERSION_REV 1009
#define VERSION_BUILD 1310
#define VERSION_REV 1030
#define VERSION_BUILD 1332
#define SCINTILLA_VER 412
#define ONIGMO_REGEX_VER 6.1.3
#define VERSION_PATCH " RC"
#define VERSION_PATCH " RC_NewMenu"