cleanup merge

diff --git a/ext/mbstring/oniguruma/src/regparse.c b/ext/mbstring/oniguruma/src/regparse.c
index 0c0b07804b8e2bec04ac643c77b8b32e1d508ef3..1904880effda0a520308821e1aa784c822e0332b 100644 (file)
--- a/ext/mbstring/oniguruma/src/regparse.c
+++ b/ext/mbstring/oniguruma/src/regparse.c
@@ -3596,7 +3596,6 @@ fetch_token(OnigToken* tok, UChar** src, UChar* end, ScanEnv* env)
           tok->u.code = c2;
         }
         else { /* string */
-          p = tok->backp + enclen(enc, tok->backp);
           int len;
           SAFE_ENC_LEN(enc, tok->backp, end, len);
           p = tok->backp + len;