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

Merge branch 'master' into mui

Browse Source
This commit is contained in:
Pairi Daiza 2020-03-02 19:53:11 +01:00 committed by GitHub
commit 9962bca50b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
oniguruma/src/regexec.c
View File

@ -4641,7 +4641,18 @@ onig_regset_search_with_param(OnigRegSet* set,
for (i = 0; i < set->n; i++) {
reg = set->rs[i].reg;
if (reg->threshold_len == 0) {
REGSET_MATCH_AND_RETURN_CHECK(end);
/* REGSET_MATCH_AND_RETURN_CHECK(end); */
/* Can't use REGSET_MATCH_AND_RETURN_CHECK()
because r must be set regex index (i)
*/
r = match_at(reg, str, end, end, s, prev, msas + i);
if (r != ONIG_MISMATCH) {
if (r >= 0) {
r = i;
goto match;
}
else goto finish; /* error */
}
}
}

2
oniguruma/version.txt
View File

@ -1 +1 @@
6.9.5
6.9.4

10
sciXlexers/LexAHKL.cxx
View File

@ -250,7 +250,7 @@ void SCI_METHOD LexerAHKL::Lex(Sci_PositionU startPos, Sci_Position lengthDoc, i
}
// Comments are allowed almost everywhere
if (!inStringBlk && !inCommentBlk && (OnlySpaces || isspace(sc.chPrev)) && sc.ch == ';')
if (!inStringBlk && !inCommentBlk && (OnlySpaces || isspacechar(sc.chPrev)) && sc.ch == ';')
sc.SetState(SCE_AHKL_COMMENTLINE);
// Exit Current State
@ -412,7 +412,7 @@ void SCI_METHOD LexerAHKL::Lex(Sci_PositionU startPos, Sci_Position lengthDoc, i
sc.Forward(2);
sc.SetState(SCE_AHKL_NEUTRAL);
} else if ((OnlySpaces || isspace(sc.chPrev)) &&
} else if ((OnlySpaces || isspacechar(sc.chPrev)) &&
((sc.ch == '@' && isalnum(sc.chNext & 0xFF)) || valDocComment.Contains(sc.ch))) {
if (valDocComment.Contains(sc.ch))
@ -443,7 +443,7 @@ void SCI_METHOD LexerAHKL::Lex(Sci_PositionU startPos, Sci_Position lengthDoc, i
}
case SCE_AHKL_HEXNUMBER: {
if (isspace(sc.ch) || SynOperator.Contains(sc.ch))
if (isspacechar(sc.ch) || SynOperator.Contains(sc.ch))
sc.SetState(SCE_AHKL_NEUTRAL);
else if (!isxdigit(sc.ch & 0xFF))
@ -610,8 +610,8 @@ void SCI_METHOD LexerAHKL::Lex(Sci_PositionU startPos, Sci_Position lengthDoc, i
// Handle Expressions
if ((OnlySpaces && sc.ch == '.') || sc.Match(" % ") || (sc.ch == '(')
|| ((valIdentifier.Contains(sc.chPrev) || isspace(sc.chPrev)) && sc.ch == '?')
|| ((valIdentifier.Contains(sc.chPrev) || isspace(sc.chPrev)) && ExpOperator.Contains(sc.ch) && sc.chNext == '=')
|| ((valIdentifier.Contains(sc.chPrev) || isspacechar(sc.chPrev)) && sc.ch == '?')
|| ((valIdentifier.Contains(sc.chPrev) || isspacechar(sc.chPrev)) && ExpOperator.Contains(sc.ch) && sc.chNext == '=')
|| (valIdentifier.Contains(sc.chPrev) && sc.ch == '[')) {
expLevel += 1;

2
scintilla/lexers/LexSQL.cxx
View File

@ -530,7 +530,7 @@ void SCI_METHOD LexerSQL::Lex(Sci_PositionU startPos, Sci_Position length, int i
} else if (!IsADoxygenChar(sc.ch)) {
char s[100];
sc.GetCurrentLowered(s, sizeof(s));
if (!isspace(sc.ch) || !kw_pldoc.InList(s + 1)) {
if (!isspacechar(sc.ch) || !kw_pldoc.InList(s + 1)) {
sc.ChangeState(SCE_SQL_COMMENTDOCKEYWORDERROR);
}
sc.SetState(styleBeforeDCKeyword);

8
src/Styles.c
View File

@ -825,11 +825,9 @@ bool Style_ExportToFile(const WCHAR* szFile, bool bForceAll)
}
}
else {
// reset
if (LoadIniFile(szFilePathNorm)) {
Style_ToIniSection(bForceAll);
ok = SaveIniFile(szFilePathNorm);
}
LoadIniFile(szFilePathNorm); // reset
Style_ToIniSection(bForceAll);
ok = SaveIniFile(szFilePathNorm);
}
return ok;
}

4
src/VersionEx.h
View File

@ -11,9 +11,9 @@
#define VERSION_REV 302
#define VERSION_BUILD 7
#define SCINTILLA_VER 431
#define ONIGURUMA_REGEX_VER 6.9.5
#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 RC2
#define VERSION_COMMIT_ID dkt1-amr
#define VERSION_COMMIT_ID t7820-rk