updated for version 7.3.840

Problem:    "\@<!" in regexp does not work correctly with multi-byte
            characters, especially cp932.
Solution:   Move column to start of multi-byte character. (Yasuhiro Matsumoto)

diff --git a/src/regexp.c b/src/regexp.c
index d85ded8af07177da9bdd89466e1b759cfa41efab..6ecb6dd7a3bf9f77be93a8e7a7955fcd888a4899 100644 (file)
--- a/src/regexp.c
+++ b/src/regexp.c
@@ -5449,6 +5449,13 @@ regmatch(scan)
                        }
                    }
                    else
+#ifdef FEAT_MBYTE
+                   if (has_mbyte)
+                       rp->rs_un.regsave.rs_u.pos.col -=
+                           (*mb_head_off)(regline, regline
+                                   + rp->rs_un.regsave.rs_u.pos.col - 1) + 1;
+                   else
+#endif
                        --rp->rs_un.regsave.rs_u.pos.col;
                }
                else

diff --git a/src/version.c b/src/version.c
index 95cea6a77c7c38387b9718fb9976e59605a4f5db..7c12188fe54a22771ec10c22594bcd58bd104080 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    840,
 /**/
     839,
 /**/