diff --git a/oniguruma/src/regexec.c b/oniguruma/src/regexec.c
index f98bcbe38..79ffce122 100644
--- a/oniguruma/src/regexec.c
+++ b/oniguruma/src/regexec.c
@@ -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 */
+        }
       }
     }
 
diff --git a/oniguruma/version.txt b/oniguruma/version.txt
index e1e5d1369..c250d84b8 100644
--- a/oniguruma/version.txt
+++ b/oniguruma/version.txt
@@ -1 +1 @@
-6.9.5
+6.9.4
diff --git a/sciXlexers/LexAHKL.cxx b/sciXlexers/LexAHKL.cxx
index 119b6f492..9a0057706 100644
--- a/sciXlexers/LexAHKL.cxx
+++ b/sciXlexers/LexAHKL.cxx
@@ -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;
diff --git a/scintilla/lexers/LexSQL.cxx b/scintilla/lexers/LexSQL.cxx
index c7f913d25..c9f79f6ac 100644
--- a/scintilla/lexers/LexSQL.cxx
+++ b/scintilla/lexers/LexSQL.cxx
@@ -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);
diff --git a/src/Styles.c b/src/Styles.c
index 210d6abf9..e01416357 100644
--- a/src/Styles.c
+++ b/src/Styles.c
@@ -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;
 }
diff --git a/src/VersionEx.h b/src/VersionEx.h
index 8a4bad78c..86edf064b 100644
--- a/src/VersionEx.h
+++ b/src/VersionEx.h
@@ -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