summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <bram@vim.org>2012-03-07 14:57:52 +0100
committerBram Moolenaar <bram@vim.org>2012-03-07 14:57:52 +0100
commit49b79d298816cf9ac03d7fcc3247e77361d6db72 (patch)
treea103cf4d2af25384f3c7e88e0d3544bf8642172a
parent0d1e86122b442f5743caab0cb627c790007c2df8 (diff)
downloadvim-49b79d298816cf9ac03d7fcc3247e77361d6db72.tar.gz
updated for version 7.3.463v7.3.463v7-3-463
Problem: When using ":s///c" the cursor is moved away from the match. (Lawman) Solution: Don't move the cursor when do_ask is set. (Christian Brabandt)
-rw-r--r--src/ex_cmds.c11
-rw-r--r--src/version.c2
2 files changed, 9 insertions, 4 deletions
diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 644c32ba..ba18d9d0 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -5151,10 +5151,13 @@ outofmem:
if (!global_busy)
{
- if (endcolumn)
- coladvance((colnr_T)MAXCOL);
- else
- beginline(BL_WHITE | BL_FIX);
+ if (!do_ask) /* when interactive leave cursor on the match */
+ {
+ if (endcolumn)
+ coladvance((colnr_T)MAXCOL);
+ else
+ beginline(BL_WHITE | BL_FIX);
+ }
if (!do_sub_msg(do_count) && do_ask)
MSG("");
}
diff --git a/src/version.c b/src/version.c
index a1b588d9..0f98e04e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 463,
+/**/
462,
/**/
461,