# HG changeset patch # User Bram Moolenaar # Date 1622836805 -7200 # Node ID b032da73667669cb96000d457450ddecf071f8f5 # Parent 7aa2abb138643aa487705f264a5051b4d4302db9 patch 8.2.2938: after using motion force from feedkeys() it sticks Commit: https://github.com/vim/vim/commit/21492743e80c6740bac65a91311c28bede8ef2f8 Author: Bram Moolenaar Date: Fri Jun 4 21:57:57 2021 +0200 patch 8.2.2938: after using motion force from feedkeys() it sticks Problem: After using motion force from feedkeys() it may not be reset. Solution: Clear motion_force in clearop(). (closes https://github.com/vim/vim/issues/8323) diff --git a/src/normal.c b/src/normal.c --- a/src/normal.c +++ b/src/normal.c @@ -1750,6 +1750,7 @@ clearop(oparg_T *oap) oap->regname = 0; oap->motion_force = NUL; oap->use_reg_one = FALSE; + motion_force = NUL; } void 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 @@ -913,6 +913,15 @@ func Test_visual_block_mode() set tabstop& shiftwidth& endfunc +func Test_visual_force_motion_feedkeys() + onoremap i- execute('let g:mode = mode(1)')->slice(0, 0) + call feedkeys('dvi-', 'x') + call assert_equal('nov', g:mode) + call feedkeys('di-', 'x') + call assert_equal('no', g:mode) + ounmap i- +endfunc + " Test block-insert using cursor keys for movement func Test_visual_block_insert_cursor_keys() new diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2938, +/**/ 2937, /**/ 2936,