summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2011-05-19 14:30:16 +0200
committerBram Moolenaar <Bram@vim.org>2011-05-19 14:30:16 +0200
commit0df110269804d128a1a4b00849b0b82bc71548a7 (patch)
treed2eb4c6f0eeaccfeca7154ee5370297f3116e0e5
parent2d5204ff882e167048af81c8990fb9d296c8dd1e (diff)
downloadvim-git-7.3.192.tar.gz
updated for version 7.3.192v7.3.192
Problem: Ex command ":s/ \?/ /g" splits multi-byte characters into bytes. (Dominique Pelle) Solution: Advance over whole character instead of one byte.
-rw-r--r--src/ex_cmds.c10
-rw-r--r--src/version.c2
2 files changed, 11 insertions, 1 deletions
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
@@ -710,6 +710,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 192,
+/**/
191,
/**/
190,