Permalink
Browse files

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.
  • Loading branch information...
brammool committed Dec 21, 2017
1 parent ae6f865 commit b73fa629d6d3d705c1f8e8d5f8109fc9abd7bb6f
Showing with 38 additions and 0 deletions.
  1. +3 −0 src/evalfunc.c
  2. +2 −0 src/normal.c
  3. +31 −0 src/testdir/test_spell.vim
  4. +2 −0 src/version.c
View
@@ -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)
{
View
@@ -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();
View
@@ -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
View
@@ -771,6 +771,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1419,
/**/
1418,
/**/

0 comments on commit b73fa62

Please sign in to comment.