mirror of
https://github.com/vim/vim
synced 2025-07-16 01:01:58 +00:00
patch 9.1.1413: spurious CursorHold triggered in GUI on startup
Problem: spurious CursorHold triggered in GUI on startup Solution: init global did_cursorhold flag to true (Gary Johnson) When Vim is started in GUI mode, the CursorHold autocommand event is triggered 'updatetime' milliseconds later, even when the user has not pressed a key. This is different from the behavior of Vim in terminal mode, which does not trigger a CursorHold autocommand event at startup, and contradicts the description of the CursorHold event in ":help CursorHold", which states that the event is "[n]ot triggered until the user has pressed a key". The fix is to change the initial value of did_cursorhold from FALSE to TRUE. While it is true that the CursorDone event has not been done yet at startup, it should appear to have been done until the user presses a key. fixes #17350 closes: #17382 Signed-off-by: Gary Johnson <garyjohn@spocom.com> Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
committed by
Christian Brabandt
parent
a004e5108c
commit
318ff9c362
@ -1614,7 +1614,7 @@ EXTERN int autocmd_bufnr INIT(= 0); // fnum for <abuf> on cmdline
|
||||
EXTERN char_u *autocmd_match INIT(= NULL); // name for <amatch> on cmdline
|
||||
EXTERN int aucmd_cmdline_changed_count INIT(= 0);
|
||||
|
||||
EXTERN int did_cursorhold INIT(= FALSE); // set when CursorHold t'gerd
|
||||
EXTERN int did_cursorhold INIT(= TRUE); // set when CursorHold t'gerd
|
||||
EXTERN pos_T last_cursormoved // for CursorMoved event
|
||||
# ifdef DO_INIT
|
||||
= {0, 0, 0}
|
||||
|
@ -1747,4 +1747,26 @@ func Test_gui_csi_keytrans()
|
||||
call assert_equal('<C-D>', keytrans("\x9b\xfc\x04D"))
|
||||
endfunc
|
||||
|
||||
" Test that CursorHold is NOT triggered at startup before a keypress
|
||||
func Test_CursorHold_not_triggered_at_startup()
|
||||
defer delete('Xcursorhold.log')
|
||||
defer delete('Xcursorhold_test.vim')
|
||||
call writefile([
|
||||
\ 'set updatetime=300',
|
||||
\ 'let g:cursorhold_triggered = 0',
|
||||
\ 'autocmd CursorHold * let g:cursorhold_triggered += 1 | call writefile(["CursorHold triggered"], "Xcursorhold.log", "a")',
|
||||
\ 'call timer_start(400, {-> execute(''call writefile(["g:cursorhold_triggered=" . g:cursorhold_triggered], "Xcursorhold.log", "a") | qa!'')})',
|
||||
\ ], 'Xcursorhold_test.vim')
|
||||
|
||||
let vimcmd = v:progpath . ' -g -f -N -u NONE -i NONE -S Xcursorhold_test.vim'
|
||||
call system(vimcmd)
|
||||
|
||||
let lines = filereadable('Xcursorhold.log') ? readfile('Xcursorhold.log') : []
|
||||
|
||||
" Assert that CursorHold did NOT trigger at startup
|
||||
call assert_false(index(lines, 'CursorHold triggered') != -1)
|
||||
let found = filter(copy(lines), 'v:val =~ "^g:cursorhold_triggered="')
|
||||
call assert_equal(['g:cursorhold_triggered=0'], found)
|
||||
endfunc
|
||||
|
||||
" vim: shiftwidth=2 sts=2 expandtab
|
||||
|
@ -709,6 +709,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
1413,
|
||||
/**/
|
||||
1412,
|
||||
/**/
|
||||
|
Reference in New Issue
Block a user