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

Merge and Version update

Browse Source
This commit is contained in:
Rainer Kottenhoff 2019-06-27 08:26:23 +02:00
parent 18f9c9c7fb
commit ea021b6da4
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Versions/build.txt
View File

@ -1 +1 @@
2256
2259

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

@ -3,7 +3,7 @@
<assemblyIdentity
name="Notepad3"
processorArchitecture="*"
version="5.19.615.2256"
version="5.19.627.2259"
type="win32"
/>
<description>Notepad3 Oniguruma</description>

14
sciXlexers/LexTOML.cxx
View File

@ -228,7 +228,7 @@ inline bool IsAKeywordChar(const int ch) {
static int GetBracketLevel(StyleContext& sc, const bool stopAtLnBreak = false)
{
Sci_Position const posCurrent = static_cast<Sci_Position>(sc.currentPos);
auto const posCurrent = static_cast<Sci_Position>(sc.currentPos);
int iBracketLevel = -1;
int inInlTbl = 0;
@ -265,8 +265,8 @@ static int GetBracketLevel(StyleContext& sc, const bool stopAtLnBreak = false)
static bool IsDateTimeStr(StyleContext& sc, const CharacterSet& validCh, const CharacterSet& valEnd)
{
Sci_Position const posCurrent = static_cast<Sci_Position>(sc.currentPos);
Sci_Position const posEnd = static_cast<Sci_Position>(sc.lineStartNext);
auto const posCurrent = static_cast<Sci_Position>(sc.currentPos);
auto const posEnd = static_cast<Sci_Position>(sc.lineStartNext);
bool bDateTimeFlag = false;
@ -294,8 +294,8 @@ static bool IsDateTimeStr(StyleContext& sc, const CharacterSet& validCh, const C
static bool IsLookAheadLineEmpty(StyleContext& sc)
{
Sci_Position const posCurrent = static_cast<Sci_Position>(sc.currentPos);
Sci_Position const posEnd = static_cast<Sci_Position>(sc.lineStartNext);
auto const posCurrent = static_cast<Sci_Position>(sc.currentPos);
auto const posEnd = static_cast<Sci_Position>(sc.lineStartNext);
bool bLHLineEmpty = true;
@ -318,8 +318,8 @@ static bool IsLookAheadLineEmpty(StyleContext& sc)
static bool IsLookAheadInList(StyleContext& sc, const CharacterSet& validCh, const WordList& keywords)
{
Sci_Position const posCurrent = static_cast<Sci_Position>(sc.currentPos);
Sci_Position const posEnd = static_cast<Sci_Position>(sc.lineStartNext);
auto const posCurrent = static_cast<Sci_Position>(sc.currentPos);
auto const posEnd = static_cast<Sci_Position>(sc.lineStartNext);
static char identifier[1024] = { '\0' };

2
src/Version.h
View File

@ -76,7 +76,7 @@
#endif
#elif (_MSC_VER >= 1916)
#if(_MSC_FULL_VER >= 191627031)
#define VER_CPL MS Visual C++ 2017 v15.9.12
#define VER_CPL MS Visual C++ 2017 v15.9.(12-13)
#elif(_MSC_FULL_VER >= 191627030)
#define VER_CPL MS Visual C++ 2017 v15.9.11
#elif(_MSC_FULL_VER >= 191627027)

4
src/VersionEx.h
View File

@ -7,8 +7,8 @@
#define SAPPNAME "Notepad3"
#define VERSION_MAJOR 5
#define VERSION_MINOR 19
#define VERSION_REV 615
#define VERSION_BUILD 2256
#define VERSION_REV 627
#define VERSION_BUILD 2259
#define SCINTILLA_VER 416
#define ONIGURUMA_REGEX_VER 6.9.2
#define VERSION_PATCH Oniguruma