From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 19 May 2011 12:30:16 +0000 (+0200)
Subject: updated for version 7.3.192
X-Git-Tag: v7.3.192
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0df110269804d128a1a4b00849b0b82bc71548a7;p=vim

updated for version 7.3.192
Problem:    Ex command ":s/ \?/ /g" splits multi-byte characters into bytes.
            (Dominique Pelle)
Solution:   Advance over whole character instead of one byte.
---

diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 9d2bdc798..64c1371bd 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -4625,7 +4625,15 @@ do_sub(eap)
 			 * for a match in this line again. */
 			skip_match = TRUE;
 		    else
-			++matchcol; /* search for a match at next column */
+		    {
+			 /* search for a match at next column */
+#ifdef FEAT_MBYTE
+			if (has_mbyte)
+			    matchcol += mb_ptr2len(sub_firstline + matchcol);
+			else
+#endif
+			    ++matchcol;
+		    }
 		    goto skip;
 		}
 
diff --git a/src/version.c b/src/version.c
index a14c43de6..94f1a95d6 100644
--- a/src/version.c
+++ b/src/version.c
@@ -709,6 +709,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    192,
 /**/
     191,
 /**/