From ea021b6da4ff50b9aa0b6d71fcda1d2134030d94 Mon Sep 17 00:00:00 2001
From: Rainer Kottenhoff <rainer.kottenhoff@gmail.com>
Date: Thu, 27 Jun 2019 08:26:23 +0200
Subject: [PATCH] Merge and Version update

---
 Versions/build.txt             |  2 +-
 res/Notepad3.exe.manifest.conf |  2 +-
 sciXlexers/LexTOML.cxx         | 14 +++++++-------
 src/Version.h                  |  2 +-
 src/VersionEx.h                |  4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Versions/build.txt b/Versions/build.txt
index d7a2e8a5b..232d55261 100644
--- a/Versions/build.txt
+++ b/Versions/build.txt
@@ -1 +1 @@
-2256
+2259
diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf
index 2b27c47fb..4b1f4bb4e 100644
--- a/res/Notepad3.exe.manifest.conf
+++ b/res/Notepad3.exe.manifest.conf
@@ -3,7 +3,7 @@
   <assemblyIdentity
     name="Notepad3"
     processorArchitecture="*"
-    version="5.19.615.2256"
+    version="5.19.627.2259"
     type="win32"
   />
   <description>Notepad3 Oniguruma</description>
diff --git a/sciXlexers/LexTOML.cxx b/sciXlexers/LexTOML.cxx
index 9e79863a8..3b7c30ff4 100644
--- a/sciXlexers/LexTOML.cxx
+++ b/sciXlexers/LexTOML.cxx
@@ -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' };
 
diff --git a/src/Version.h b/src/Version.h
index 70371288f..efb85e09c 100644
--- a/src/Version.h
+++ b/src/Version.h
@@ -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)
diff --git a/src/VersionEx.h b/src/VersionEx.h
index 191ea6da3..2d2981521 100644
--- a/src/VersionEx.h
+++ b/src/VersionEx.h
@@ -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