diff --git a/Build/Notepad3.ini b/Build/Notepad3.ini
index 5b9767a40..82fb6ba1d 100644
Binary files a/Build/Notepad3.ini and b/Build/Notepad3.ini differ
diff --git a/Notepad3.sln b/Notepad3.sln
index d4fb8bdae..34d8abe18 100644
--- a/Notepad3.sln
+++ b/Notepad3.sln
@@ -4,9 +4,11 @@ VisualStudioVersion = 15.0.26430.16
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Notepad3", "src\Notepad3.vcxproj", "{BAAD32AB-CD47-12FD-873C-0BBC204B7641}"
ProjectSection(ProjectDependencies) = postProject
+ {9DC82B0D-2484-4925-92AD-1237C64CCB78} = {9DC82B0D-2484-4925-92AD-1237C64CCB78}
{5877B917-512B-49F5-B514-1B4159E7A9CA} = {5877B917-512B-49F5-B514-1B4159E7A9CA}
{146D0122-33C6-4C1B-9E7A-178DEC80842E} = {146D0122-33C6-4C1B-9E7A-178DEC80842E}
{C8E80B4C-C0FD-4119-A05A-AB372A61007F} = {C8E80B4C-C0FD-4119-A05A-AB372A61007F}
+ {9B31015C-CB08-4B4B-A957-313A93F862F5} = {9B31015C-CB08-4B4B-A957-313A93F862F5}
{EC255B64-2C2F-4CB6-9D40-4542893FE5E6} = {EC255B64-2C2F-4CB6-9D40-4542893FE5E6}
{3B8C289D-FF47-4237-AD7B-0702230F41A3} = {3B8C289D-FF47-4237-AD7B-0702230F41A3}
{ADCA49F0-D91B-4AB9-913A-5840DCA8C79E} = {ADCA49F0-D91B-4AB9-913A-5840DCA8C79E}
@@ -43,6 +45,9 @@ EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "np3_en_us", "language\np3_en_us\np3_en_us.vcxproj", "{9DC82B0D-2484-4925-92AD-1237C64CCB78}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "np3_af_za", "language\np3_af_za\np3_af_za.vcxproj", "{C8E80B4C-C0FD-4119-A05A-AB372A61007F}"
+ ProjectSection(ProjectDependencies) = postProject
+ {9DC82B0D-2484-4925-92AD-1237C64CCB78} = {9DC82B0D-2484-4925-92AD-1237C64CCB78}
+ EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "np3_nl_nl", "language\np3_nl_nl\np3_nl_nl.vcxproj", "{9B31015C-CB08-4B4B-A957-313A93F862F5}"
ProjectSection(ProjectDependencies) = postProject
diff --git a/Version.ps1 b/Version.ps1
index ade690f06..1a05fa537 100644
--- a/Version.ps1
+++ b/Version.ps1
@@ -32,6 +32,7 @@ function DebugOutput($msg)
try
{
+ $AppName = "Notepad3"
$Major = 4
$Minor = [int]$(Get-Date -format yy)
$Revis = [int]$(Get-Date -format MMdd)
@@ -53,6 +54,7 @@ try
if ($VerPatch) { $VerPatch = " $VerPatch" } # ensure space in front of string
Copy-Item -LiteralPath "Versions\VersionEx.h.tpl" -Destination "src\VersionEx.h" -Force
+ (Get-Content "src\VersionEx.h") | ForEach-Object { $_ -replace '\$APPNAME\$', "$AppName" } | Set-Content "src\VersionEx.h"
(Get-Content "src\VersionEx.h") | ForEach-Object { $_ -replace '\$MAJOR\$', "$Major" } | Set-Content "src\VersionEx.h"
(Get-Content "src\VersionEx.h") | ForEach-Object { $_ -replace '\$MINOR\$', "$Minor" } | Set-Content "src\VersionEx.h"
(Get-Content "src\VersionEx.h") | ForEach-Object { $_ -replace '\$MAINT\$', "$Revis" } | Set-Content "src\VersionEx.h"
@@ -60,10 +62,11 @@ if ($VerPatch) { $VerPatch = " $VerPatch" } # ensure space in front of string
(Get-Content "src\VersionEx.h") | ForEach-Object { $_ -replace '\$SCIVER\$', "$SciVer" } | Set-Content "src\VersionEx.h"
(Get-Content "src\VersionEx.h") | ForEach-Object { $_ -replace '\$ONIGMOVER\$', "$OnigmoVer" } | Set-Content "src\VersionEx.h"
(Get-Content "src\VersionEx.h") | ForEach-Object { $_ -replace '\$VERPATCH\$', "$VerPatch" } | Set-Content "src\VersionEx.h"
- (Get-Content "src\VersionEx.h") | ForEach-Object { $_ -replace '\$VERPATCH\$', "$VerPatch" } | Set-Content "src\VersionEx.h"
Copy-Item -LiteralPath "Versions\Notepad3.exe.manifest.tpl" -Destination "res\Notepad3.exe.manifest.conf" -Force
- (Get-Content "res\Notepad3.exe.manifest.conf") | ForEach-Object { $_ -replace '\$VERSION\$', $CompleteVer } | Set-Content "res\Notepad3.exe.manifest.conf"
+ (Get-Content "res\Notepad3.exe.manifest.conf") | ForEach-Object { $_ -replace '\$APPNAME\$', "$AppName" } | Set-Content "res\Notepad3.exe.manifest.conf"
+ (Get-Content "res\Notepad3.exe.manifest.conf") | ForEach-Object { $_ -replace '\$VERPATCH\$', "$VerPatch" } | Set-Content "res\Notepad3.exe.manifest.conf"
+ (Get-Content "res\Notepad3.exe.manifest.conf") | ForEach-Object { $_ -replace '\$VERSION\$', "$CompleteVer" } | Set-Content "res\Notepad3.exe.manifest.conf"
if ($AppVeyorEnv) {
Update-AppveyorBuild -Version $CompleteVer
}
diff --git a/Versions/Notepad3.exe.manifest.tpl b/Versions/Notepad3.exe.manifest.tpl
index d9d81b152..e2eb5cd30 100644
--- a/Versions/Notepad3.exe.manifest.tpl
+++ b/Versions/Notepad3.exe.manifest.tpl
@@ -1,10 +1,10 @@
- Notepad3
+ $APPNAME$ $VERPATCH$
diff --git a/Versions/VersionEx.h.tpl b/Versions/VersionEx.h.tpl
index 7182471bc..12b0aeec4 100644
Binary files a/Versions/VersionEx.h.tpl and b/Versions/VersionEx.h.tpl differ
diff --git a/Versions/build.txt b/Versions/build.txt
index eeb072e53..7d802a3e7 100644
--- a/Versions/build.txt
+++ b/Versions/build.txt
@@ -1 +1 @@
-997
+1002
diff --git a/language/common_res.h b/language/common_res.h
index 7eb0bb8c3..da982c2b4 100644
--- a/language/common_res.h
+++ b/language/common_res.h
@@ -627,6 +627,7 @@
#define IDS_LEX_MATLAB 63043
#define IDS_LEX_NIM_SRC 63044
#define IDS_LEX_R_STAT 63045
+#define IDS_LEX_RUST_SRC 63046
#define IDS_LEX_STD_STYLE 63100
#define IDS_LEX_STD_MARGIN 63101
@@ -872,5 +873,9 @@
#define IDS_LEX_STR_63340 63340
#define IDS_LEX_STR_63341 63341
#define IDS_LEX_STR_63342 63342
+#define IDS_LEX_STR_63343 63343
+#define IDS_LEX_STR_63344 63344
+#define IDS_LEX_STR_63345 63345
+#define IDS_LEX_STR_63346 63346
#endif //_COMMON_RES_H_
diff --git a/language/np3_af_za/lexer_af_za.rc b/language/np3_af_za/lexer_af_za.rc
index 05308f888..84516d374 100644
Binary files a/language/np3_af_za/lexer_af_za.rc and b/language/np3_af_za/lexer_af_za.rc differ
diff --git a/language/np3_af_za/menu_af_za.rc b/language/np3_af_za/menu_af_za.rc
index a3ec4e3ea..ae5ebca8d 100644
Binary files a/language/np3_af_za/menu_af_za.rc and b/language/np3_af_za/menu_af_za.rc differ
diff --git a/language/np3_de_de/dialogs_de_de.rc b/language/np3_de_de/dialogs_de_de.rc
index 48b56eb57..8a27ade4c 100644
Binary files a/language/np3_de_de/dialogs_de_de.rc and b/language/np3_de_de/dialogs_de_de.rc differ
diff --git a/language/np3_de_de/lexer_de_de.rc b/language/np3_de_de/lexer_de_de.rc
index a445b72fd..8a5b45b99 100644
Binary files a/language/np3_de_de/lexer_de_de.rc and b/language/np3_de_de/lexer_de_de.rc differ
diff --git a/language/np3_de_de/menu_de_de.rc b/language/np3_de_de/menu_de_de.rc
index 56f2d6ed7..7147fcea3 100644
Binary files a/language/np3_de_de/menu_de_de.rc and b/language/np3_de_de/menu_de_de.rc differ
diff --git a/language/np3_de_de/strings_de_de.rc b/language/np3_de_de/strings_de_de.rc
index 693d1aefc..8a5b6066b 100644
Binary files a/language/np3_de_de/strings_de_de.rc and b/language/np3_de_de/strings_de_de.rc differ
diff --git a/language/np3_en_uk/dialogs_en_uk.rc b/language/np3_en_uk/dialogs_en_uk.rc
index b66609de7..c3ed7df6e 100644
Binary files a/language/np3_en_uk/dialogs_en_uk.rc and b/language/np3_en_uk/dialogs_en_uk.rc differ
diff --git a/language/np3_en_uk/lexer_en_uk.rc b/language/np3_en_uk/lexer_en_uk.rc
index d169088e0..789aeb887 100644
Binary files a/language/np3_en_uk/lexer_en_uk.rc and b/language/np3_en_uk/lexer_en_uk.rc differ
diff --git a/language/np3_en_uk/menu_en_uk.rc b/language/np3_en_uk/menu_en_uk.rc
index 2e1cec777..f02b7e208 100644
Binary files a/language/np3_en_uk/menu_en_uk.rc and b/language/np3_en_uk/menu_en_uk.rc differ
diff --git a/language/np3_en_us/dialogs_en_us.rc b/language/np3_en_us/dialogs_en_us.rc
index da967a651..22e829e70 100644
Binary files a/language/np3_en_us/dialogs_en_us.rc and b/language/np3_en_us/dialogs_en_us.rc differ
diff --git a/language/np3_en_us/lexer_en_us.rc b/language/np3_en_us/lexer_en_us.rc
index b3b10effb..f7bf4ee39 100644
Binary files a/language/np3_en_us/lexer_en_us.rc and b/language/np3_en_us/lexer_en_us.rc differ
diff --git a/language/np3_en_us/menu_en_us.rc b/language/np3_en_us/menu_en_us.rc
index ba4d9cd29..ae66a1609 100644
Binary files a/language/np3_en_us/menu_en_us.rc and b/language/np3_en_us/menu_en_us.rc differ
diff --git a/language/np3_en_us/np3_en_us.vcxproj b/language/np3_en_us/np3_en_us.vcxproj
index 58f29c344..6542cc329 100644
--- a/language/np3_en_us/np3_en_us.vcxproj
+++ b/language/np3_en_us/np3_en_us.vcxproj
@@ -109,7 +109,7 @@
mkdir "$(TargetDir)..\en-US"
-"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -q "$(SolutionDir)language\DoReverseMuiLoc.rcconfig" -v 2 -x 0x0809 -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)..\np3lng.dll" "$(TargetDir)..\en-US\np3lng.dll.mui"
+"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -q "$(SolutionDir)language\DoReverseMuiLoc.rcconfig" -v 2 -x 0x0409 -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)..\np3lng.dll" "$(TargetDir)..\en-US\np3lng.dll.mui"
MUI Split
@@ -134,7 +134,7 @@
mkdir "$(TargetDir)..\en-US"
-"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -q "$(SolutionDir)language\DoReverseMuiLoc.rcconfig" -v 2 -x 0x0809 -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)..\np3lng.dll" "$(TargetDir)..\en-US\np3lng.dll.mui"
+"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -q "$(SolutionDir)language\DoReverseMuiLoc.rcconfig" -v 2 -x 0x0409 -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)..\np3lng.dll" "$(TargetDir)..\en-US\np3lng.dll.mui"
MUI Split
@@ -163,7 +163,7 @@
mkdir "$(TargetDir)..\en-US"
-"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -q "$(SolutionDir)language\DoReverseMuiLoc.rcconfig" -v 2 -x 0x0809 -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)..\np3lng.dll" "$(TargetDir)..\en-US\np3lng.dll.mui"
+"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -q "$(SolutionDir)language\DoReverseMuiLoc.rcconfig" -v 2 -x 0x0409 -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)..\np3lng.dll" "$(TargetDir)..\en-US\np3lng.dll.mui"
MUI Split
@@ -192,7 +192,7 @@
mkdir "$(TargetDir)..\en-US"
-"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -q "$(SolutionDir)language\DoReverseMuiLoc.rcconfig" -v 2 -x 0x0809 -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)..\np3lng.dll" "$(TargetDir)..\en-US\np3lng.dll.mui"
+"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -q "$(SolutionDir)language\DoReverseMuiLoc.rcconfig" -v 2 -x 0x0409 -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)..\np3lng.dll" "$(TargetDir)..\en-US\np3lng.dll.mui"
MUI Split
diff --git a/language/np3_es_es/dialogs_es_es.rc b/language/np3_es_es/dialogs_es_es.rc
index fcec1aef4..68ba32d35 100644
Binary files a/language/np3_es_es/dialogs_es_es.rc and b/language/np3_es_es/dialogs_es_es.rc differ
diff --git a/language/np3_es_es/lexer_es_es.rc b/language/np3_es_es/lexer_es_es.rc
index 788618e8d..0ca395335 100644
Binary files a/language/np3_es_es/lexer_es_es.rc and b/language/np3_es_es/lexer_es_es.rc differ
diff --git a/language/np3_es_es/menu_es_es.rc b/language/np3_es_es/menu_es_es.rc
index 0ea7d384f..7371575be 100644
Binary files a/language/np3_es_es/menu_es_es.rc and b/language/np3_es_es/menu_es_es.rc differ
diff --git a/language/np3_fr_fr/dialogs_fr_fr.rc b/language/np3_fr_fr/dialogs_fr_fr.rc
index 63cb201a6..4fabe1883 100644
Binary files a/language/np3_fr_fr/dialogs_fr_fr.rc and b/language/np3_fr_fr/dialogs_fr_fr.rc differ
diff --git a/language/np3_fr_fr/lexer_fr_fr.rc b/language/np3_fr_fr/lexer_fr_fr.rc
index 8578f169a..8e1d1b5b1 100644
Binary files a/language/np3_fr_fr/lexer_fr_fr.rc and b/language/np3_fr_fr/lexer_fr_fr.rc differ
diff --git a/language/np3_fr_fr/menu_fr_fr.rc b/language/np3_fr_fr/menu_fr_fr.rc
index 30d6b04f3..ac330080d 100644
Binary files a/language/np3_fr_fr/menu_fr_fr.rc and b/language/np3_fr_fr/menu_fr_fr.rc differ
diff --git a/language/np3_nl_nl/dialogs_nl_nl.rc b/language/np3_nl_nl/dialogs_nl_nl.rc
index 2d1cae34e..7bee68fd8 100644
Binary files a/language/np3_nl_nl/dialogs_nl_nl.rc and b/language/np3_nl_nl/dialogs_nl_nl.rc differ
diff --git a/language/np3_nl_nl/lexer_nl_nl.rc b/language/np3_nl_nl/lexer_nl_nl.rc
index 5edfca5f7..1b661b3e6 100644
Binary files a/language/np3_nl_nl/lexer_nl_nl.rc and b/language/np3_nl_nl/lexer_nl_nl.rc differ
diff --git a/language/np3_nl_nl/menu_nl_nl.rc b/language/np3_nl_nl/menu_nl_nl.rc
index 0261e6e9b..3d54c04ef 100644
Binary files a/language/np3_nl_nl/menu_nl_nl.rc and b/language/np3_nl_nl/menu_nl_nl.rc differ
diff --git a/language/np3_nl_nl/np3_nl_nl.vcxproj b/language/np3_nl_nl/np3_nl_nl.vcxproj
index 42dff1851..4ed617fee 100644
--- a/language/np3_nl_nl/np3_nl_nl.vcxproj
+++ b/language/np3_nl_nl/np3_nl_nl.vcxproj
@@ -109,7 +109,9 @@
mkdir "$(TargetDir)..\nl-NL"
-"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -q "$(SolutionDir)language\DoReverseMuiLoc.rcconfig" -v 2 -x 0x0413 -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)..\np3lng.dll" "$(TargetDir)..\nl-NL\np3lng.dll.mui"
+"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -q "$(SolutionDir)language\DoReverseMuiLoc.rcconfig" -v 2 -x 0x0413 -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)$(TargetFileName).discard" "$(TargetDir)..\nl-NL\np3lng.dll.mui"
+"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -c "$(TargetDir)..\np3lng.dll" -e "$(TargetDir)..\nl-NL\np3lng.dll.mui"
+
MUI Split
@@ -134,7 +136,9 @@
mkdir "$(TargetDir)..\nl-NL"
-"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -q "$(SolutionDir)language\DoReverseMuiLoc.rcconfig" -v 2 -x 0x0413 -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)..\np3lng.dll" "$(TargetDir)..\nl-NL\np3lng.dll.mui"
+"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -q "$(SolutionDir)language\DoReverseMuiLoc.rcconfig" -v 2 -x 0x0413 -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)$(TargetFileName).discard" "$(TargetDir)..\nl-NL\np3lng.dll.mui"
+"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -c "$(TargetDir)..\np3lng.dll" -e "$(TargetDir)..\nl-NL\np3lng.dll.mui"
+
MUI Split
@@ -163,7 +167,9 @@
mkdir "$(TargetDir)..\nl-NL"
-"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -q "$(SolutionDir)language\DoReverseMuiLoc.rcconfig" -v 2 -x 0x0413 -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)..\np3lng.dll" "$(TargetDir)..\nl-NL\np3lng.dll.mui"
+"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -q "$(SolutionDir)language\DoReverseMuiLoc.rcconfig" -v 2 -x 0x0413 -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)$(TargetFileName).discard" "$(TargetDir)..\nl-NL\np3lng.dll.mui"
+"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -c "$(TargetDir)..\np3lng.dll" -e "$(TargetDir)..\nl-NL\np3lng.dll.mui"
+
MUI Split
@@ -192,7 +198,9 @@
mkdir "$(TargetDir)..\nl-NL"
-"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -q "$(SolutionDir)language\DoReverseMuiLoc.rcconfig" -v 2 -x 0x0413 -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)..\np3lng.dll" "$(TargetDir)..\nl-NL\np3lng.dll.mui"
+"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -q "$(SolutionDir)language\DoReverseMuiLoc.rcconfig" -v 2 -x 0x0413 -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)$(TargetFileName).discard" "$(TargetDir)..\nl-NL\np3lng.dll.mui"
+"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -c "$(TargetDir)..\np3lng.dll" -e "$(TargetDir)..\nl-NL\np3lng.dll.mui"
+
MUI Split
diff --git a/np3portableapp/Notepad3Portable/App/DefaultData/settings/Notepad3.ini b/np3portableapp/Notepad3Portable/App/DefaultData/settings/Notepad3.ini
index 5b9767a40..82fb6ba1d 100644
Binary files a/np3portableapp/Notepad3Portable/App/DefaultData/settings/Notepad3.ini and b/np3portableapp/Notepad3Portable/App/DefaultData/settings/Notepad3.ini differ
diff --git a/np3portableapp/build_np3portableapp.cmd b/np3portableapp/build_np3portableapp.cmd
index 84edc0da6..fb7efc1e0 100644
--- a/np3portableapp/build_np3portableapp.cmd
+++ b/np3portableapp/build_np3portableapp.cmd
@@ -35,7 +35,7 @@ set PORTAPP_APP_COMPACTOR=%PORTAPP_ROOT_DIR%\PortableApps.comAppCompactor\Portab
set PORTAPP_LAUNCHER_CREATOR=%PORTAPP_ROOT_DIR%\PortableApps.comLauncher\PortableApps.comLauncherGenerator.exe
set PORTAPP_INSTALLER_CREATOR=%PORTAPP_ROOT_DIR%\PortableApps.comInstaller\PortableApps.comInstaller.exe
-set NP3_LANGUAGE_SET=af-ZA de-DE en-UK es-ES fr-FR
+set NP3_LANGUAGE_SET=af-ZA de-DE en-UK es-ES fr-FR nl-NL
set NP3_DISTRIB_DIR=%SCRIPT_DIR%..\Build
set NP3_WIN32_DIR=%SCRIPT_DIR%..\Bin\Release_x86_v141
diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf
index 4b7b33f6f..dbab4efb1 100644
--- a/res/Notepad3.exe.manifest.conf
+++ b/res/Notepad3.exe.manifest.conf
@@ -3,8 +3,8 @@
- Notepad3
+ Notepad3 X_MUI
diff --git a/scintilla/Scintilla.vcxproj b/scintilla/Scintilla.vcxproj
index 80db1b3ca..f566bc0ff 100644
--- a/scintilla/Scintilla.vcxproj
+++ b/scintilla/Scintilla.vcxproj
@@ -297,6 +297,7 @@
+
diff --git a/scintilla/Scintilla.vcxproj.filters b/scintilla/Scintilla.vcxproj.filters
index f51856662..234149116 100644
--- a/scintilla/Scintilla.vcxproj.filters
+++ b/scintilla/Scintilla.vcxproj.filters
@@ -450,6 +450,9 @@
win32
+
+ lexers
+
diff --git a/scintilla/src/Catalogue.cxx b/scintilla/src/Catalogue.cxx
index 8ee396777..76238994c 100644
--- a/scintilla/src/Catalogue.cxx
+++ b/scintilla/src/Catalogue.cxx
@@ -167,7 +167,7 @@ int Scintilla_LinkLexers() {
//LINK_LEXER(lmREBOL);
LINK_LEXER(lmRegistry);
LINK_LEXER(lmRuby);
- //LINK_LEXER(lmRust);
+ LINK_LEXER(lmRust);
//LINK_LEXER(lmScriptol);
//LINK_LEXER(lmSmalltalk);
//LINK_LEXER(lmSML);
diff --git a/src/Dialogs.c b/src/Dialogs.c
index 7c6e4656b..7741194e5 100644
--- a/src/Dialogs.c
+++ b/src/Dialogs.c
@@ -447,7 +447,7 @@ INT_PTR CALLBACK AboutDlgProc(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam
case WM_INITDIALOG:
{
{
- SetDlgItemText(hwnd, IDC_VERSION, VERSION_FILEVERSION_LONG);
+ SetDlgItemText(hwnd, IDC_VERSION, L"" VERSION_FILEVERSION_LONG);
if (hFontTitle) { DeleteObject(hFontTitle); }
@@ -599,7 +599,7 @@ INT_PTR CALLBACK AboutDlgProc(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam
case IDC_COPYVERSTRG:
{
WCHAR wchVerInfo[1024] = { L'\0' };
- StringCchCopy(wchVerInfo, COUNTOF(wchVerInfo), VERSION_FILEVERSION_LONG);
+ StringCchCopy(wchVerInfo, COUNTOF(wchVerInfo), L"" VERSION_FILEVERSION_LONG);
StringCchCat(wchVerInfo, COUNTOF(wchVerInfo), L"\n" VERSION_SCIVERSION);
StringCchCat(wchVerInfo, COUNTOF(wchVerInfo), L"\n" VERSION_COMPILER);
SetClipboardTextW(g_hwndMain, wchVerInfo);
@@ -718,7 +718,7 @@ INT_PTR CALLBACK RunDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lParam)
ExpandEnvironmentStringsEx(arg1,COUNTOF(arg1));
ExtractFirstArgument(arg1,arg1,arg2,MAX_PATH);
- if (StringCchCompareIN(arg1,COUNTOF(arg1),L"notepad3",-1) == 0 ||
+ if (StringCchCompareIN(arg1,COUNTOF(arg1), TSTRG(APPNAME),-1) == 0 ||
StringCchCompareIN(arg1,COUNTOF(arg1),L"notepad3.exe",-1) == 0) {
GetModuleFileName(NULL,arg1,COUNTOF(arg1));
bQuickExit = true;
diff --git a/src/Helpers.c b/src/Helpers.c
index 8c313ba65..6ac498491 100644
--- a/src/Helpers.c
+++ b/src/Helpers.c
@@ -286,10 +286,10 @@ DWORD GetLastErrorToMsgBox(LPWSTR lpszFunction, DWORD dwErrID)
// Display the error message and exit the process
LPVOID lpDisplayBuf = (LPVOID)LocalAlloc(LMEM_ZEROINIT,
- (lstrlen((LPCWSTR)lpMsgBuf) + lstrlen((LPCWSTR)lpszFunction) + 40) * sizeof(WCHAR));
+ (lstrlen((LPCWSTR)lpMsgBuf) + lstrlen((LPCWSTR)lpszFunction) + 80) * sizeof(WCHAR));
StringCchPrintf((LPWSTR)lpDisplayBuf, LocalSize(lpDisplayBuf) / sizeof(WCHAR),
- L"Error: '%s' failed with error id %d:\n%s", lpszFunction, dwErrID, lpMsgBuf);
+ L"Error: '%s' failed with error id %d:\n%s.\n", lpszFunction, dwErrID, lpMsgBuf);
MessageBox(NULL, (LPCWSTR)lpDisplayBuf, L"Notepad3 - ERROR", MB_OK | MB_ICONEXCLAMATION);
diff --git a/src/Notepad3.c b/src/Notepad3.c
index 92c1a7907..82cef699f 100644
--- a/src/Notepad3.c
+++ b/src/Notepad3.c
@@ -47,12 +47,12 @@
#include "../uthash/utlist.h"
#include "encoding.h"
#include "helpers.h"
+#include "VersionEx.h"
#include "SciCall.h"
#include "notepad3.h"
-
/******************************************************************************
*
* Local and global Variables for Notepad3.c
@@ -348,7 +348,7 @@ int iSortOptions = 0;
int iAlignMode = 0;
bool flagIsElevated = false;
-WCHAR wchWndClass[16] = WC_NOTEPAD3;
+WCHAR wchWndClass[16] = L"" APPNAME;
HINSTANCE g_hInstance = NULL;
@@ -1079,7 +1079,7 @@ HWND InitInstance(HINSTANCE hInstance,LPSTR pszCmdLine,int nCmdShow)
g_hwndMain = CreateWindowEx(
0,
wchWndClass,
- L"Notepad3",
+ L"" APPNAME,
WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN,
g_WinInfo.x,
g_WinInfo.y,
@@ -7012,7 +7012,7 @@ void ParseCommandLine()
lp1 + CSTRLEN(L"appid="),len - CSTRLEN(L"appid="));
StrTrim(g_wchAppUserModelID,L" ");
if (StringCchLenW(g_wchAppUserModelID,COUNTOF(g_wchAppUserModelID)) == 0)
- StringCchCopy(g_wchAppUserModelID,COUNTOF(g_wchAppUserModelID),L"Notepad3");
+ StringCchCopy(g_wchAppUserModelID,COUNTOF(g_wchAppUserModelID), L"" APPNAME);
}
else if (StrCmpNI(lp1,L"sysmru=",CSTRLEN(L"sysmru=")) == 0) {
@@ -7393,7 +7393,7 @@ void LoadFlags()
g_flagNoFileVariables = 1;
if (StringCchLenW(g_wchAppUserModelID,COUNTOF(g_wchAppUserModelID)) == 0) {
- IniSectionGetString(pIniSection,L"ShellAppUserModelID",L"Notepad3",
+ IniSectionGetString(pIniSection,L"ShellAppUserModelID", L"" APPNAME,
g_wchAppUserModelID,COUNTOF(g_wchAppUserModelID));
}
@@ -7461,7 +7461,7 @@ static bool __fastcall _CheckIniFile(LPWSTR lpszFile,LPCWSTR lpszModule)
static bool __fastcall _CheckIniFileRedirect(LPWSTR lpszFile,LPCWSTR lpszModule)
{
WCHAR tch[MAX_PATH] = { L'\0' };
- if (GetPrivateProfileString(L"Notepad3",L"Notepad3.ini",L"",tch,COUNTOF(tch),lpszFile)) {
+ if (GetPrivateProfileString(L"" APPNAME, L"" APPNAME ".ini",L"",tch,COUNTOF(tch),lpszFile)) {
if (_CheckIniFile(tch,lpszModule)) {
StringCchCopy(lpszFile,MAX_PATH,tch);
return true;
@@ -9611,7 +9611,7 @@ void ShowNotifyIcon(HWND hwnd,bool bAdd)
nid.uFlags = NIF_ICON | NIF_MESSAGE | NIF_TIP;
nid.uCallbackMessage = WM_TRAYMESSAGE;
nid.hIcon = hIcon;
- StringCchCopy(nid.szTip,COUNTOF(nid.szTip),L"Notepad3");
+ StringCchCopy(nid.szTip,COUNTOF(nid.szTip), L"" APPNAME);
if(bAdd)
Shell_NotifyIcon(NIM_ADD,&nid);
diff --git a/src/Notepad3.h b/src/Notepad3.h
index c9371027d..da6a1ea12 100644
--- a/src/Notepad3.h
+++ b/src/Notepad3.h
@@ -19,7 +19,6 @@
#include "TypeDefs.h"
//==== Main Window ============================================================
-#define WC_NOTEPAD3 L"Notepad3"
#define ONLINE_HELP_WEBSITE L"https://www.rizonesoft.com/documents/notepad3/"
diff --git a/src/Notepad3.rc b/src/Notepad3.rc
index 555d3f6c3..675b7c83e 100644
--- a/src/Notepad3.rc
+++ b/src/Notepad3.rc
@@ -75,6 +75,7 @@ BEGIN
"A", IDM_EDIT_SELECTALL, VIRTKEY, CONTROL, NOINVERT
"A", IDM_VIEW_MARKOCCUR_ONOFF, VIRTKEY, ALT, NOINVERT
"A", CMD_RECODEANSI, VIRTKEY, SHIFT, CONTROL, NOINVERT
+ "A", IDM_VIEW_ACCELWORDNAV, VIRTKEY, CONTROL, ALT, NOINVERT
"B", IDM_EDIT_FINDMATCHINGBRACE, VIRTKEY, CONTROL, NOINVERT
"B", IDM_EDIT_PADWITHSPACES, VIRTKEY, ALT, NOINVERT
"B", IDM_EDIT_SELTOMATCHINGBRACE, VIRTKEY, SHIFT, CONTROL, NOINVERT
diff --git a/src/Notepad3.ver b/src/Notepad3.ver
index c10ee4639..47f60aade 100644
--- a/src/Notepad3.ver
+++ b/src/Notepad3.ver
@@ -37,15 +37,15 @@ BEGIN
BEGIN
BLOCK "040904b0"
BEGIN
- VALUE "Comments", APPNAMEA
- VALUE "FileDescription", APPNAMEA
- VALUE "InternalName", APPNAMEA
- VALUE "ProductName", APPNAMEA
+ VALUE "Comments", APPNAME
+ VALUE "FileDescription", APPNAME
+ VALUE "InternalName", APPNAME
+ VALUE "ProductName", APPNAME
VALUE "CompanyName", VERSION_COMPANYNAME
VALUE "FileVersion", VERSION_FILEVERSION
VALUE "ProductVersion", VERSION_FILEVERSION
VALUE "LegalCopyright", VERSION_LEGALCOPYRIGHT
- VALUE "OriginalFilename", APPNAMEA ".exe"
+ VALUE "OriginalFilename", APPNAME ".exe"
END
END
BLOCK "VarFileInfo"
diff --git a/src/Styles.c b/src/Styles.c
index aec71bf3f..88602689d 100644
--- a/src/Styles.c
+++ b/src/Styles.c
@@ -2940,6 +2940,51 @@ EDITLEXER lexR = { SCLEX_R, IDS_LEX_R_STAT, L"R-S-SPlus Statistics Code", L"R",
+KEYWORDLIST KeyWords_Rust = {
+ // Primary keywords and identifiers
+ "as be break const continue crate else enum extern false fn for "
+ "if impl in let loop match mod mut once pub ref return self "
+ "static struct super trait true type unsafe use while",
+ // Built in types
+ "bool char f32 f64 i16 i32 i64 i8 int str u16 u32 u64 u8 uint",
+ // Other keywords
+ "abstract alignof become box do final macro offsetof override "
+ "priv proc pure sizeof typeof unsized virtual yield",
+ // Keywords 4
+ "",
+ // Keywords 5
+ "",
+ // Keywords 6
+ "",
+ // Keywords 7
+ "",
+ // 0
+ "" };
+
+
+EDITLEXER lexRust = { SCLEX_RUST, IDS_LEX_RUST_SRC, L"Rust Source Code", L"rs; rust", L"", &KeyWords_Rust,{
+ { STYLE_DEFAULT, IDS_LEX_STR_63126, L"Default", L"", L"" },
+ //{ SCE_RUST_DEFAULT, IDS_LEX_STR_63126, L"Default", L"", L"" },
+ { SCE_RUST_IDENTIFIER, IDS_LEX_STR_63129, L"Identifier", L"", L"" },
+ { SCE_RUST_WORD, IDS_LEX_STR_63128, L"Keyword", L"bold; fore:#248112", L"" },
+ { SCE_RUST_WORD2, IDS_LEX_STR_63343, L"Build-In Type", L"fore:#A9003D", L"" },
+ { SCE_RUST_WORD3, IDS_LEX_STR_63345, L"Other Keyword", L"italic; fore:#248112", L"" },
+ //{ SCE_RUST_WORD4, IDS_LEX_STR_63128, L"Keyword 4", L"bold; fore:#0A246A", L"" },
+ //{ SCE_RUST_WORD5, IDS_LEX_STR_63128, L"Keyword 5", L"bold; fore:#0A246A", L"" },
+ //{ SCE_RUST_WORD6, IDS_LEX_STR_63128, L"Keyword 6", L"bold; fore:#0A246A", L"" },
+ //{ SCE_RUST_WORD7, IDS_LEX_STR_63128, L"Keyword 7", L"bold; fore:#0A246A", L"" },
+ { SCE_RUST_NUMBER, IDS_LEX_STR_63130, L"Number", L"fore:#666666", L"" },
+ { MULTI_STYLE(SCE_RUST_COMMENTBLOCK,SCE_RUST_COMMENTLINE,SCE_RUST_COMMENTBLOCKDOC,SCE_RUST_COMMENTLINEDOC), IDS_LEX_STR_63127, L"Comment", L"italic; fore:#488080", L"" },
+ { MULTI_STYLE(SCE_RUST_STRING,SCE_RUST_STRINGR,SCE_RUST_CHARACTER,0), IDS_LEX_STR_63131, L"String", L"fore:#B31C1B", L"" },
+ { SCE_RUST_OPERATOR, IDS_LEX_STR_63132, L"Operator", L"fore:#666666", L"" },
+ { SCE_RUST_MACRO, IDS_LEX_STR_63280, L"Macro Definition", L"fore:#0A246A", L"" },
+ { SCE_RUST_LIFETIME, IDS_LEX_STR_63346, L"Rust Lifetime", L"fore:#B000B0", L"" },
+ { SCE_RUST_LEXERROR, IDS_LEX_STR_63252, L"Parsing Error", L"fore:#F0F0F0; back:#F00000", L"" },
+ { MULTI_STYLE(SCE_RUST_BYTESTRING,SCE_RUST_BYTESTRINGR,SCE_RUST_BYTECHARACTER,0), IDS_LEX_STR_63344, L"Byte String", L"fore:#C0C0C0", L"" },
+ { -1, 00000, L"", L"", L"" } } };
+
+
+
// This array holds all the lexers...
// Don't forget to change the number of the lexer for HTML and XML
// in Notepad2.c ParseCommandLine() if you change this array!
@@ -2983,6 +3028,7 @@ static PEDITLEXER g_pLexArray[NUMLEXERS] =
&lexRC, // Resource Script
&lexR, // R Statistics Code
&lexRUBY, // Ruby Script
+ &lexRust, // Rust Script
&lexBASH, // Shell Script
&lexSQL, // SQL Query
&lexTCL, // Tcl Script
diff --git a/src/Styles.h b/src/Styles.h
index e87f65e01..00850b1fc 100644
--- a/src/Styles.h
+++ b/src/Styles.h
@@ -61,7 +61,7 @@ typedef struct _editlexer
// Number of Lexers in pLexArray
-#define NUMLEXERS 47
+#define NUMLEXERS 48
#define AVG_NUM_OF_STYLES_PER_LEXER 20
diff --git a/src/Version.h b/src/Version.h
index 0d3cba6f8..605c7de97 100644
Binary files a/src/Version.h and b/src/Version.h differ
diff --git a/src/VersionEx.h b/src/VersionEx.h
index 66d463cbe..26d962847 100644
--- a/src/VersionEx.h
+++ b/src/VersionEx.h
@@ -3,11 +3,11 @@
// this file is generated - use template to apply changes //
// //
// //////////////////////////////////////////////////////////
+#define APPNAME "Notepad3"
#define VERSION_MAJOR 4
#define VERSION_MINOR 18
-#define VERSION_REV 519
-#define VERSION_BUILD 997
+#define VERSION_REV 606
+#define VERSION_BUILD 1002
#define SCINTILLA_VER 405
#define ONIGMO_REGEX_VER 6.1.3
-#define VERSION_PATCH L" X_MUI"
-#define VERSIONA_PATCH " X_MUI"
+#define VERSION_PATCH " X_MUI"