# HG changeset patch
# User Bram Moolenaar <bram@vim.org>
# Date 1361900761 -3600
# Node ID 1778d51fcbc37e819c305b860f98c949915d35eb
# Parent  569633c125ca0e34219b95c0fc6de1ac603a6dfe
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
--- 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
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    840,
+/**/
     839,
 /**/
     838,