diff --git a/scintilla/oniguruma/HISTORY b/scintilla/oniguruma/HISTORY
index 07355d5fc..5ec62cc82 100644
--- a/scintilla/oniguruma/HISTORY
+++ b/scintilla/oniguruma/HISTORY
@@ -1,6 +1,10 @@
 History
 
-2021/04/XX: Version 6.9.7
+2021/04/15: Version 6.9.7 revised 1
+
+2021/04/14: fix: replace UChar to OnigUChar in oniguruma.h
+
+2021/04/14: Version 6.9.7
 2021/03/31: Release Candidate 1 for Version 6.9.7
 
 2021/03/23: fix Issue 32340, 32345, 32355 in oss-fuzz
diff --git a/scintilla/oniguruma/doc/CALLOUTS.API b/scintilla/oniguruma/doc/CALLOUTS.API
index f525f8673..7ecf6bcd1 100644
--- a/scintilla/oniguruma/doc/CALLOUTS.API
+++ b/scintilla/oniguruma/doc/CALLOUTS.API
@@ -367,9 +367,9 @@ Callouts API  Version 6.9.7 2021/03/21
   Returns the callout data value/type for a callout slot indicated by tag/slot.
   This function does not clear the value set in the collation position before the current position. (dont_clear_old)
 
-  ONIG_NORMAL:           ????
-  ONIG_VALUE_IS_NOT_SET: ?????? / ??VOID
-  < 0: ??????
+  ONIG_NORMAL:           正常終了
+  ONIG_VALUE_IS_NOT_SET: 値が未セット / 型がVOID
+  < 0: エラーコード
 
 
 (9) Miscellaneous functions
diff --git a/scintilla/oniguruma/src/oniguruma.h b/scintilla/oniguruma/src/oniguruma.h
index 51fa4d041..540f61e2e 100644
--- a/scintilla/oniguruma/src/oniguruma.h
+++ b/scintilla/oniguruma/src/oniguruma.h
@@ -742,7 +742,7 @@ typedef struct {
   OnigCaseFoldType   case_fold_flag;
 } OnigCompileInfo;
 
-typedef int (*OnigCallbackEachMatchFunc)(const UChar* str, const UChar* end, const UChar* match_start, OnigRegion* region, void* user_data);
+typedef int (*OnigCallbackEachMatchFunc)(const OnigUChar* str, const OnigUChar* end, const OnigUChar* match_start, OnigRegion* region, void* user_data);
 
 
 /* types for callout */
@@ -1015,7 +1015,7 @@ int onig_get_callout_data_by_tag P_((OnigRegex reg, OnigMatchParam* mp, const On
 ONIG_EXTERN
 int onig_set_callout_data_by_tag P_((OnigRegex reg, OnigMatchParam* mp, const OnigUChar* tag, const OnigUChar* tag_end, int slot, OnigType type, OnigValue* val));
 ONIG_EXTERN
-int onig_get_callout_data_by_tag_dont_clear_old P_((regex_t* reg, OnigMatchParam* mp, const UChar* tag, const UChar* tag_end, int slot, OnigType* type, OnigValue* val));
+int onig_get_callout_data_by_tag_dont_clear_old P_((regex_t* reg, OnigMatchParam* mp, const OnigUChar* tag, const OnigUChar* tag_end, int slot, OnigType* type, OnigValue* val));
 
 /* used in callout functions */
 ONIG_EXTERN
diff --git a/scintilla/oniguruma/version.txt b/scintilla/oniguruma/version.txt
index 6e8962767..aa902ca82 100644
--- a/scintilla/oniguruma/version.txt
+++ b/scintilla/oniguruma/version.txt
@@ -1 +1 @@
-6.9.6
+6.9.7