merge Oniguruma 4.4.5

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11234 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 1 insertions, 2 deletions

diff --git a/regcomp.c b/regcomp.c
index 9b862657d8..3f7168d968 100644
--- a/regcomp.c
+++ b/regcomp.c
@@ -5277,6 +5277,7 @@ onig_compile(regex_t* reg, const UChar* pattern, const UChar* pattern_end,
  err:
   if (IS_NOT_NULL(scan_env.error)) {
     if (IS_NOT_NULL(einfo)) {
+      einfo->enc     = scan_env.enc;
       einfo->par     = scan_env.error;
       einfo->par_end = scan_env.error_end;
     }
@@ -5470,8 +5471,6 @@ OnigOpInfoType OnigOpInfo[] = {
   { OP_ANYCHAR_ML_STAR_PEEK_NEXT, "anychar-ml*-peek-next", ARG_SPECIAL },
   { OP_WORD,                "word",            ARG_NON },
   { OP_NOT_WORD,            "not-word",        ARG_NON },
-  { OP_WORD_SB,             "word-sb",         ARG_NON },
-  { OP_WORD_MB,             "word-mb",         ARG_NON },
   { OP_WORD_BOUND,          "word-bound",      ARG_NON },
   { OP_NOT_WORD_BOUND,      "not-word-bound",  ARG_NON },
   { OP_WORD_BEGIN,          "word-begin",      ARG_NON },