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 9.1.0088: TextChanged not triggered for :norm! commands

Browse Source 
Problem:  TextChanged not triggered for :norm! commands
          (machakann, after v9.0.2031)
Solution: Only reset curbuf->b_last_changedtick if TextChangedI
          was triggered in insert mode (and not blocked)

Note: for unknown reasons, the test fails on Windows (but seems to work
fine when running interactively)

fixes: #13967
closes: #13984

Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Christian Brabandt 2024-02-09 19:34:36 +01:00
parent 2975a54f28
commit c9e79e5284
No known key found for this signature in database
GPG Key ID: F3F92DA383FDDE09
3 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/edit.c
View File

@ -843,7 +843,12 @@ doESCkey:
if (cmdchar != 'r' && cmdchar != 'v' && c != Ctrl_C)
ins_apply_autocmds(EVENT_INSERTLEAVE);
did_cursorhold = FALSE;
curbuf->b_last_changedtick = CHANGEDTICK(curbuf);
// ins_redraw() triggers TextChangedI only when no characters
// are in the typeahead buffer, so only reset curbuf->b_last_changedtick
// if the TextChangedI was not blocked by char_avail() (e.g. using :norm!)
if (!char_avail())
curbuf->b_last_changedtick = CHANGEDTICK(curbuf);
return (c == Ctrl_O);
}
continue;

18
src/testdir/test_autocmd.vim
View File

@ -2706,6 +2706,24 @@ func Test_TextChangedI_with_setline()
bwipe!
endfunc
func Test_TextChanged_with_norm()
" For unknown reason this fails on MS-Windows
CheckNotMSWindows
CheckFeature terminal
let buf = term_start([GetVimProg(), '--clean', '-c', 'set noswapfile'], {'term_rows': 3})
call assert_equal('running', term_getstatus(buf))
call term_sendkeys(buf, ":let g:a=0\<cr>")
call term_wait(buf, 50)
call term_sendkeys(buf, ":au! TextChanged * :let g:a+=1\<cr>")
call term_wait(buf, 50)
call term_sendkeys(buf, ":norm! ia\<cr>")
call term_wait(buf, 50)
call term_sendkeys(buf, ":echo g:a\<cr>")
call term_wait(buf, 50)
call WaitForAssert({-> assert_match('^1.*$', term_getline(buf, 3))})
bwipe!
endfunc
func Test_Changed_FirstTime()
CheckFeature terminal
CheckNotGui

2
src/version.c
View File

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