From f5e44a7e90a68f91da540fe9da8b62fb9e2aeea6 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 26 Feb 2013 18:46:01 +0100
Subject: [PATCH] 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)

---
 src/regexp.c  | 7 +++++++
 src/version.c | 2 ++
 2 files changed, 9 insertions(+)

diff --git a/src/regexp.c b/src/regexp.c
index d85ded8af..6ecb6dd7a 100644
--- 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 95cea6a77..7c12188fe 100644
--- 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,
 /**/
-- 
2.50.1