summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2013-09-25 23:24:57 +0200
committerBram Moolenaar <Bram@vim.org>2013-09-25 23:24:57 +0200
commit033d8888e8d6648b5540dc3dda85aba3c5a192de (patch)
treecdbe3c1bf57d48a8bd45f0c25a9ff6f889df8b26
parentcca74134564a99f638a583d79d2cfd3ca393673d (diff)
downloadvim-git-033d8888e8d6648b5540dc3dda85aba3c5a192de.tar.gz
updated for version 7.4.041v7.4.041
Problem: Visual selection does not remain after being copied over. (Axel Bender) Solution: Move when VIsual_active is reset. (Christian Brabandt)
-rw-r--r--src/ops.c7
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 3 deletions
diff --git a/src/ops.c b/src/ops.c
index db5a182c1..b1f75a1ea 100644
--- a/src/ops.c
+++ b/src/ops.c
@@ -3808,9 +3808,6 @@ do_put(regname, dir, count, flags)
FALSE /* stop after 1 paste */
#endif
);
-#ifdef FEAT_VISUAL
- VIsual_active = FALSE;
-#endif
curbuf->b_op_end = curwin->w_cursor;
/* For "CTRL-O p" in Insert mode, put cursor after last char */
@@ -3972,6 +3969,10 @@ end:
if (regname == '=')
vim_free(y_array);
+#ifdef FEAT_VISUAL
+ VIsual_active = FALSE;
+#endif
+
/* If the cursor is past the end of the line put it at the end. */
adjust_cursor_eol();
}
diff --git a/src/version.c b/src/version.c
index c7a2011c1..9da06c8d4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 41,
+/**/
40,
/**/
39,