aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.0.1419: cursor column is not updated after ]s

Browse Source 
Problem:    Cursor column is not updated after ]s. (Gary Johnson)
Solution:   Set the curswant flag.
This commit is contained in:
Bram Moolenaar 2017-12-21 20:27:47 +01:00
parent ae6f865125
commit b73fa629d6
4 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/evalfunc.c
View File

@ -11173,7 +11173,10 @@ f_spellbadword(typval_T *argvars UNUSED, typval_T *rettv)
/* Find the start and length of the badly spelled word. */ /* Find the start and length of the badly spelled word. */
len = spell_move_to(curwin, FORWARD, TRUE, TRUE, &attr); len = spell_move_to(curwin, FORWARD, TRUE, TRUE, &attr);
if (len != 0) if (len != 0)
{
word = ml_get_cursor(); word = ml_get_cursor();
curwin->w_set_curswant = TRUE;
}
} }
else if (curwin->w_p_spell && *curbuf->b_s.b_p_spl != NUL) else if (curwin->w_p_spell && *curbuf->b_s.b_p_spl != NUL)
{ {

2
src/normal.c
View File

@ -6814,6 +6814,8 @@ nv_brackets(cmdarg_T *cap)
clearopbeep(cap->oap); clearopbeep(cap->oap);
break; break;
} }
else
curwin->w_set_curswant = TRUE;
# ifdef FEAT_FOLDING # ifdef FEAT_FOLDING
if (cap->oap->op_type == OP_NOP && (fdo_flags & FDO_SEARCH) && KeyTyped) if (cap->oap->op_type == OP_NOP && (fdo_flags & FDO_SEARCH) && KeyTyped)
foldOpenCursor(); foldOpenCursor();

31
src/testdir/test_spell.vim
View File

@ -28,6 +28,37 @@ func Test_wrap_search()
set nospell set nospell
endfunc 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() func Test_z_equal_on_invalid_utf8_word()
split split
set spell set spell

2
src/version.c
View File

@ -771,6 +771,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1419,
/**/ /**/
1418, 1418,
/**/ /**/