From f22b11f5dfdbd8408505ae6f9bdb31913f447457 Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Sun, 22 Mar 2020 09:52:21 +0100 Subject: [PATCH] +chg: add "lang" in RC lexer in anticipation of feature grepWin --- Build/minipath.ini | 4 ++-- Versions/build.txt | 2 +- Versions/day.txt | 2 +- res/Notepad3.exe.manifest.conf | 2 +- src/StyleLexers/styleLexRC.c | 2 +- src/VersionEx.h | 6 +++--- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Build/minipath.ini b/Build/minipath.ini index be21017ff..ab631d8f0 100644 --- a/Build/minipath.ini +++ b/Build/minipath.ini @@ -48,7 +48,7 @@ &All Files=*.* &Windows Text Files=*.txt;*.asc;*.bat;*.vbs;*.ini;*.inf;*.reg;*.xml;*.text;*.tmp;*.log;*.doc;*.wtx;*.csv &HTML Related Files=*.htm;*.html;*.shtml;*.php;*.css;*.js;*.vbs;*.gif;*.png;*.jpg;*.jpeg;*.bmp;*.txt;*.css;*.less;*.hss;*.sass;*.scss -&C/C++ Related Files=*.c;*.cpp;*.h;*.hpp;*.rc;*.ico;*.cur;*.bmp;*.txt;*.nsi;*.nsh;*.cs;*.csx;*.vala;*.cxx;*.cc;*.hxx;*.hh;*.mm;*.idl;*.midl;*.inl;*.odl;*.xpm;*.pch +&C/C++ Related Files=*.c;*.cpp;*.h;*.hpp;*.rc;*.ico;*.cur;*.bmp;*.txt;*.nsi;*.nsh;*.cs;*.csx;*.vala;*.cxx;*.cc;*.hxx;*.hh;*.mm;*.idl;*.midl;*.inl;*.odl;*.xpm;*.pch;*.lang &No Binary Files=-*.exe;*.dll;*.cpl;*.ocx;*.bin;*.com;*.sys;*.scr;*.dat;*.dsk ;Text Files=*.txt;*.text;*.tmp;*.log;*.asc;*.doc;*.wtx ;ANSI Art=*.nfo;*.diz @@ -85,7 +85,7 @@ Pascal Source Code=*.pas;*.dpr;*.dpk;*.dfm;*.pp;*.lfm;*.lpr;*.fpd ;PowerShell Script=*.ps1;*.psd1;*.psm1;*.psc1 Python Script=*.py;*.pyw;*.pyx;*.pxd;*.pxi;*.boo;*.empy;*.cobra;*.gs ;Registry Files=*.reg -Resource Script=*.rc;*.rc2;*.rct;*.rh;*.dlg +Resource Script=*.rc;*.rc2;*.rct;*.rh;*.dlg;*.lang ;R-S-SPlus Statistics Code=*.r, rdata, rds, rda Ruby Script=*.rb;*.ruby;*.rbw;*.rake;*.rjs;*.rakefile;*.gemspec;*.podspec ;Rust Source Code=*.rs;*.rust diff --git a/Versions/build.txt b/Versions/build.txt index b8626c4cf..d00491fd7 100644 --- a/Versions/build.txt +++ b/Versions/build.txt @@ -1 +1 @@ -4 +1 diff --git a/Versions/day.txt b/Versions/day.txt index 3ae0b938f..18fdcb2a9 100644 --- a/Versions/day.txt +++ b/Versions/day.txt @@ -1 +1 @@ -321 +322 diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index 4b2835165..35ea143bf 100644 --- a/res/Notepad3.exe.manifest.conf +++ b/res/Notepad3.exe.manifest.conf @@ -3,7 +3,7 @@ Notepad3 RC3 diff --git a/src/StyleLexers/styleLexRC.c b/src/StyleLexers/styleLexRC.c index a784dc7ed..01d15f5d7 100644 --- a/src/StyleLexers/styleLexRC.c +++ b/src/StyleLexers/styleLexRC.c @@ -13,7 +13,7 @@ NULL, EDITLEXER lexRC = { -SCLEX_CPP, IDS_LEX_RESOURCE_SCR, L"Resource Script", L"rc; rc2; rct; rh; dlg", L"", +SCLEX_CPP, IDS_LEX_RESOURCE_SCR, L"Resource Script", L"rc; rc2; rct; rh; dlg; lang", L"", &KeyWords_RC, { { {STYLE_DEFAULT}, IDS_LEX_STR_63126, L"Default", L"", L"" }, //{ {SCE_C_DEFAULT}, IDS_LEX_STR_63126, L"Default", L"", L"" }, diff --git a/src/VersionEx.h b/src/VersionEx.h index 813c0eb4a..399bdedb9 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -8,12 +8,12 @@ #define SAPPNAME "Notepad3" #define VERSION_MAJOR 5 #define VERSION_MINOR 20 -#define VERSION_REV 321 -#define VERSION_BUILD 4 +#define VERSION_REV 322 +#define VERSION_BUILD 1 #define SCINTILLA_VER 432 #define ONIGURUMA_REGEX_VER 6.9.4 #define UCHARDET_VER 2018.09.27 #define TINYEXPR_VER 2018.05.11 #define UTHASH_VER 2.1.0 #define VERSION_PATCH RC3 -#define VERSION_COMMIT_ID nebukadn +#define VERSION_COMMIT_ID dkt1-amr