From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 21 Dec 2017 19:27:47 +0000 (+0100)
Subject: patch 8.0.1419: cursor column is not updated after ]s
X-Git-Tag: v8.0.1419
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b73fa629d6d3d705c1f8e8d5f8109fc9abd7bb6f;p=vim

patch 8.0.1419: cursor column is not updated after ]s

Problem:    Cursor column is not updated after ]s. (Gary Johnson)
Solution:   Set the curswant flag.
---

diff --git a/src/evalfunc.c b/src/evalfunc.c
index 7f78a9d70..764a4db64 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -11173,7 +11173,10 @@ f_spellbadword(typval_T *argvars UNUSED, typval_T *rettv)
 	/* Find the start and length of the badly spelled word. */
 	len = spell_move_to(curwin, FORWARD, TRUE, TRUE, &attr);
 	if (len != 0)
+	{
 	    word = ml_get_cursor();
+	    curwin->w_set_curswant = TRUE;
+	}
     }
     else if (curwin->w_p_spell && *curbuf->b_s.b_p_spl != NUL)
     {
diff --git a/src/normal.c b/src/normal.c
index a8e65ffd6..745a2f68c 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -6814,6 +6814,8 @@ nv_brackets(cmdarg_T *cap)
 		clearopbeep(cap->oap);
 		break;
 	    }
+	    else
+		curwin->w_set_curswant = TRUE;
 # ifdef FEAT_FOLDING
 	if (cap->oap->op_type == OP_NOP && (fdo_flags & FDO_SEARCH) && KeyTyped)
 	    foldOpenCursor();
diff --git a/src/testdir/test_spell.vim b/src/testdir/test_spell.vim
index 54209fec7..3e8ba1def 100644
--- a/src/testdir/test_spell.vim
+++ b/src/testdir/test_spell.vim
@@ -28,6 +28,37 @@ func Test_wrap_search()
   set nospell
 endfunc
 
+func Test_curswant()
+  new
+  call setline(1, ['Another plong line', 'abcdefghijklmnopq'])
+  set spell wrapscan
+  normal 0]s
+  call assert_equal('plong', expand('<cword>'))
+  normal j
+  call assert_equal(9, getcurpos()[2])
+  normal 0[s
+  call assert_equal('plong', expand('<cword>'))
+  normal j
+  call assert_equal(9, getcurpos()[2])
+
+  normal 0]S
+  call assert_equal('plong', expand('<cword>'))
+  normal j
+  call assert_equal(9, getcurpos()[2])
+  normal 0[S
+  call assert_equal('plong', expand('<cword>'))
+  normal j
+  call assert_equal(9, getcurpos()[2])
+
+  normal 1G0
+  call assert_equal('plong', spellbadword()[0])
+  normal j
+  call assert_equal(9, getcurpos()[2])
+
+  bwipe!
+  set nospell
+endfunc
+
 func Test_z_equal_on_invalid_utf8_word()
   split
   set spell
diff --git a/src/version.c b/src/version.c
index 9f034d78c..6ae213535 100644
--- a/src/version.c
+++ b/src/version.c
@@ -771,6 +771,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1419,
 /**/
     1418,
 /**/