updated for version 7.1-164

diff --git a/src/regexp.c b/src/regexp.c
index b62f877a824633cc165fca46ce40dae464065e35..6717d2c7363d8c2a24f16bb04ffa715c8322a2a5 100644 (file)
--- a/src/regexp.c
+++ b/src/regexp.c
@@ -2770,7 +2770,8 @@ skipchr()
     {
 #ifdef FEAT_MBYTE
        if (enc_utf8)
-           prevchr_len += utf_char2len(mb_ptr2char(regparse + prevchr_len));
+           /* exclude composing chars that mb_ptr2len does include */
+           prevchr_len += utf_ptr2len(regparse + prevchr_len);
        else if (has_mbyte)
            prevchr_len += (*mb_ptr2len)(regparse + prevchr_len);
        else

diff --git a/src/version.c b/src/version.c
index 1dd2a23930dd9171ec289f08e67ba7160e2fc8d4..1aecf6c270d687468c8013c498df7a99c88a4cb2 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    164,
 /**/
     163,
 /**/