Merge pull request #1976 from RaiKoHoff/RC1

Change version numbering (build number daily based)

Version.ps1

@@ -36,11 +36,22 @@ try
 	$Major = 5
 	$Minor = [int]$(Get-Date -format yy)
 	$Revis = [int]$(Get-Date -format MMdd)
+	$Build = [int](Get-Content "Versions\build.txt")
+	if (!$Build) { $Build = 0 }
+
 	if ($AppVeyorEnv) {
+		#~ $Build = [int]($env:appveyor_build_number)
 		$CommitID = ([string]($env:appveyor_repo_commit)).substring(0,8)
-		$Build = [int]($env:appveyor_build_number)
 	}
 	else {
+		$LastBuildDay = [string](Get-Content "Versions\day.txt")
+		if ($LastBuildDay -ne "$Revis") {
+			$Build = 0  # reset
+			$Revis | Set-Content "Versions\day.txt"
+		}
+		$Build = $Build + 1
+		$Build | Set-Content "Versions\build.txt"
+
 		$CommitID = [string](Get-Content "Versions\commit_id.txt")
 		if ($CommitID -eq "computername") {
 			$CommitID = ([string]($env:computername)).substring(0,8).ToLower()
@@ -48,10 +59,15 @@ try
 		else {
 			$CommitID = $CommitID.substring(0,8)
 		}
-		$Build = [int](Get-Content "Versions\build.txt") + 1
 	}
 	if (!$CommitID) { $CommitID = "---" }
-	if (!$Build) { $Build = 0 }
+
+	$CompleteVer = "$Major.$Minor.$Revis.$Build"
+	DebugOutput("Version number: 'v$CompleteVer $VerPatch'")
+	if ($AppVeyorEnv) {
+		Update-AppveyorBuild -Version $CompleteVer
+	}
+
 	$SciVer = [string](Get-Content "scintilla\version.txt")
 	if (!$SciVer) { $SciVer = 0 }
 	$OnigVer = [string](Get-Content "oniguruma\version.txt")
@@ -62,12 +78,6 @@ try
 	if (!$TinyExprVer) { $TinyExprVer = "0.0.0" }
 	$UtHashVer = [string](Get-Content "uthash\version.txt")
 	if (!$UtHashVer) { $UtHashVer = "0.0.0" }
-	
-	$CompleteVer = "$Major.$Minor.$Revis.$Build"
-	DebugOutput("Version number: 'v$CompleteVer $VerPatch'")
-	if ($AppVeyorEnv) {
-		Update-AppveyorBuild -Version $CompleteVer
-	}
 
 #~if ($VerPatch) { $VerPatch = " $VerPatch" }  # ensure space in front of string
 
@@ -99,7 +109,6 @@ catch
 }
 finally
 {
-	$Build | Set-Content "Versions\build.txt"
 	[Environment]::SetEnvironmentVariable("LASTEXITCODE", $LastExitCode, "User")
 	$host.SetShouldExit($LastExitCode)
 	Write-Host "VersionPatching: Done! Elapsed time: $($stopwatch.Elapsed)."

Version_RC.cmd

@@ -1,6 +1,6 @@
 @echo off
 setlocal
-set _VERPATCH_=RC
+set _VERPATCH_=RC1
 echo."%_VERPATCH_%">.\np3portableapp\_buildname.txt
 Version -VerPatch "%_VERPATCH_%"
 endlocal

Versions/build.txt

@@ -1 +1 @@
-3224
+0

Versions/day.txt

@@ -0,0 +1 @@
+212

src/StyleLexers/styleLexLUA.c

@@ -3,6 +3,7 @@
 // ----------------------------------------------------------------------------
 
 KEYWORDLIST KeyWords_LUA = {
+// Keywords
 "and break do else elseif end false for function goto if in local nil not or repeat return "
 "then true until while",
 // Basic Functions
@@ -39,9 +40,9 @@ SCLEX_LUA, IDS_LEX_LUA, L"Lua Script", L"lua; wlua; nse; luadoc; luax", L"",
     { {MULTI_STYLE(SCE_LUA_COMMENT,SCE_LUA_COMMENTLINE,SCE_LUA_COMMENTDOC,0)}, IDS_LEX_STR_63127, L"Comment", L"fore:#008000", L"" },
     { {SCE_LUA_NUMBER}, IDS_LEX_STR_63130, L"Number", L"fore:#008080", L"" },
     { {SCE_LUA_WORD}, IDS_LEX_STR_63128, L"Keyword", L"fore:#00007F", L"" },
-    { {SCE_LUA_WORD}, IDS_LEX_STR_63298, L"Basic Functions", L"fore:#00007F", L"" },
-    { {SCE_LUA_WORD}, IDS_LEX_STR_63299, L"String, Table & Math Functions", L"fore:#00007F", L"" },
-    { {SCE_LUA_WORD}, IDS_LEX_STR_63300, L"Input, Output & System Facilities", L"fore:#00007F", L"" },
+    { {SCE_LUA_WORD2}, IDS_LEX_STR_63298, L"Basic Functions", L"fore:#00007F", L"" },
+    { {SCE_LUA_WORD3}, IDS_LEX_STR_63299, L"String, Table & Math Functions", L"fore:#00007F", L"" },
+    { {SCE_LUA_WORD4}, IDS_LEX_STR_63300, L"Input, Output & System Facilities", L"fore:#00007F", L"" },
     { {MULTI_STYLE(SCE_LUA_STRING,SCE_LUA_STRINGEOL,SCE_LUA_CHARACTER,0)}, IDS_LEX_STR_63131, L"String", L"fore:#B000B0", L"" },
     { {SCE_LUA_LITERALSTRING}, IDS_LEX_STR_63301, L"Literal String", L"fore:#B000B0", L"" },
     { {SCE_LUA_PREPROCESSOR}, IDS_LEX_STR_63133, L"Preprocessor", L"fore:#FF8000", L"" },