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

Merge remote-tracking branch 'notepad3_orig_rizone/master' into NewFeatures

Browse Source 
# Conflicts:
#	Versions/build.txt
#	res/Notepad3.exe.manifest.conf
#	src/VersionEx.h
This commit is contained in:
Rainer Kottenhoff 2020-03-22 13:49:14 +01:00
commit 66a764f1fd
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Build/minipath.ini
View File

@ -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

2
Versions/build.txt
View File

@ -1 +1 @@
2
1

2
Versions/day.txt
View File

@ -1 +1 @@
321
322

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

@ -3,8 +3,8 @@
<assemblyIdentity
name="Notepad3"
processorArchitecture="*"
version="5.20.321.2"
version="5.20.322.1"
type="win32"
/>
<description>Notepad3 NF</description>
<description>Notepad3 RC3</description>
</assembly>

2
src/StyleLexers/styleLexRC.c
View File

@ -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"" },

8
src/VersionEx.h
View File

@ -8,12 +8,12 @@
#define SAPPNAME "Notepad3"
#define VERSION_MAJOR 5
#define VERSION_MINOR 20
#define VERSION_REV 321
#define VERSION_BUILD 2
#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 NF
#define VERSION_COMMIT_ID nebukadn
#define VERSION_PATCH RC3
#define VERSION_COMMIT_ID dkt1-amr