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

Merge pull request #1330 from RaiKoHoff/Dev_RC_Fixes

Browse Source 
Fix small bug in file extension matching for Lexer selection
This commit is contained in:
Rainer Kottenhoff 2019-06-11 20:17:44 +02:00 committed by GitHub
commit c2e88b1bb2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Versions/build.txt
View File

@ -1 +1 @@
2249
2250

2
np3portableapp/_buildname.txt
View File

@ -1 +1 @@
"RC2"
"RC"

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

@ -3,8 +3,8 @@
<assemblyIdentity
name="Notepad3"
processorArchitecture="*"
version="5.19.611.2249"
version="5.19.611.2250"
type="win32"
/>
<description>Notepad3 RC2</description>
<description>Notepad3 RC</description>
</assembly>

8
src/Styles.c
View File

@ -902,18 +902,20 @@ void Style_SetLexerSpecificProperties(const int lexerId)
static inline bool _IsItemInStyleString(LPCWSTR lpszStyleStrg, LPCWSTR item)
{
LPCWSTR pFound = StrStrI(lpszStyleStrg, item);
if (pFound) {
const WCHAR pre = (pFound == lpszStyleStrg) ? L' ' : pFound[-1];
while (pFound) {
WCHAR const pre = (pFound == lpszStyleStrg) ? L' ' : pFound[-1];
if ((pre == L' ') || (pre == L';')) {
const WCHAR end = pFound[lstrlen(item)];
WCHAR const end = pFound[StringCchLenW(item, 0)];
if ((end == L'\0') || (end == L' ') || (end == L';')) {
return true;
}
}
pFound = StrStrI(pFound + 1, item);
}
return false;
}
//=============================================================================
//
// Style_SetLexer()

4
src/VersionEx.h
View File

@ -8,7 +8,7 @@
#define VERSION_MAJOR 5
#define VERSION_MINOR 19
#define VERSION_REV 611
#define VERSION_BUILD 2249
#define VERSION_BUILD 2250
#define SCINTILLA_VER 416
#define ONIGMO_REGEX_VER 6.2.0
#define VERSION_PATCH RC2
#define VERSION_PATCH RC