From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 25 Sep 2013 21:24:57 +0000 (+0200)
Subject: updated for version 7.4.041
X-Git-Tag: v7.4.041
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=033d8888e8d6648b5540dc3dda85aba3c5a192de;p=vim

updated for version 7.4.041
Problem:    Visual selection does not remain after being copied over. (Axel
            Bender)
Solution:   Move when VIsual_active is reset. (Christian Brabandt)
---

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
@@ -738,6 +738,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    41,
 /**/
     40,
 /**/