Mercurial > vim
changeset 13088:3dd37eec73f0 v8.0.1419
patch 8.0.1419: cursor column is not updated after ]s
commit https://github.com/vim/vim/commit/b73fa629d6d3d705c1f8e8d5f8109fc9abd7bb6f
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Dec 21 20:27:47 2017 +0100
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.
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Thu, 21 Dec 2017 20:30:06 +0100 |
parents | 4a5e22458adb |
children | 5127f347a3e4 |
files | src/evalfunc.c src/normal.c src/testdir/test_spell.vim src/version.c |
diffstat | 4 files changed, 38 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -11173,7 +11173,10 @@ f_spellbadword(typval_T *argvars UNUSED, /* 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) {
--- 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();
--- 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