# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1487328304 -3600
# Node ID 8f6df2f6d2fc59de28a49fc639952727cfa9be0e
# Parent  7d9d6a327e18aeb842226e9cc6f9e8368c55170c
patch 8.0.0330: illegal memory access after "vapo"

commit https://github.com/vim/vim/commit/84b2a381451e9068b09ef6d85f5e8cf1598e7355
Author: Bram Moolenaar <Bram@vim.org>
Date:   Fri Feb 17 11:40:00 2017 +0100

    patch 8.0.0330: illegal memory access after "vapo"

    Problem:    Illegal memory access after "vapo". (Dominique Pelle)
    Solution:   Fix the cursor column.

diff --git a/src/search.c b/src/search.c
--- a/src/search.c
+++ b/src/search.c
@@ -4241,7 +4241,11 @@ extend:
 	 * line, we get stuck there.  Trap this here. */
 	if (VIsual_mode == 'V' && start_lnum == curwin->w_cursor.lnum)
 	    goto extend;
-	VIsual.lnum = start_lnum;
+	if (VIsual.lnum != start_lnum)
+	{
+	    VIsual.lnum = start_lnum;
+	    VIsual.col = 0;
+	}
 	VIsual_mode = 'V';
 	redraw_curbuf_later(INVERTED);	/* update the inversion */
 	showmode();
diff --git a/src/testdir/test_visual.vim b/src/testdir/test_visual.vim
--- a/src/testdir/test_visual.vim
+++ b/src/testdir/test_visual.vim
@@ -36,3 +36,10 @@ func Test_Visual_ctrl_o()
   set tw&
   bw!
 endfu
+
+func Test_Visual_vapo()
+  new
+  normal oxx
+  normal vapo
+  bwipe!
+endfunc
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    330,
+/**/
     329,
 /**/
     328,