changeset 4176:1778d51fcbc3 v7.3.840

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)
author Bram Moolenaar <bram@vim.org>
date Tue, 26 Feb 2013 18:46:01 +0100
parents 569633c125ca
children 2d0b1a0d4275
files src/regexp.c src/version.c
diffstat 2 files changed, 9 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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,