mirror of
https://github.com/vim/vim.git
synced 2025-09-24 03:44:06 -04:00
patch 9.1.0112: Remove undo information, when cleaning quickfix buffer
Problem: When the quickfix buffer has been modified an autocommand may invalidate the undo stack (kawarimidoll) Solution: When clearing the quickfix buffer, also wipe the undo stack fixes: #13905 closes: #13928 Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
@@ -4829,8 +4829,18 @@ qf_fill_buffer(qf_list_T *qfl, buf_T *buf, qfline_T *old_last, int qf_winid)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// delete all existing lines
|
// delete all existing lines
|
||||||
|
//
|
||||||
|
// Note: we cannot store undo information, because
|
||||||
|
// qf buffer is usually not allowed to be modified.
|
||||||
|
//
|
||||||
|
// So we need to clean up undo information
|
||||||
|
// otherwise autocommands may invalidate the undo stack
|
||||||
while ((curbuf->b_ml.ml_flags & ML_EMPTY) == 0)
|
while ((curbuf->b_ml.ml_flags & ML_EMPTY) == 0)
|
||||||
(void)ml_delete((linenr_T)1);
|
(void)ml_delete((linenr_T)1);
|
||||||
|
|
||||||
|
// Remove all undo information
|
||||||
|
u_blockfree(curbuf);
|
||||||
|
u_clearall(curbuf);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check if there is anything to display
|
// Check if there is anything to display
|
||||||
|
@@ -4413,4 +4413,32 @@ func Test_autocmd_shortmess()
|
|||||||
delfunc SetupVimTest_shm
|
delfunc SetupVimTest_shm
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
|
func Test_autocmd_invalidates_undo_on_textchanged()
|
||||||
|
CheckRunVimInTerminal
|
||||||
|
let script =<< trim END
|
||||||
|
set hidden
|
||||||
|
" create quickfix list (at least 2 lines to move line)
|
||||||
|
vimgrep /u/j %
|
||||||
|
|
||||||
|
" enter quickfix window
|
||||||
|
cwindow
|
||||||
|
|
||||||
|
" set modifiable
|
||||||
|
setlocal modifiable
|
||||||
|
|
||||||
|
" set autocmd to clear quickfix list
|
||||||
|
|
||||||
|
autocmd! TextChanged <buffer> call setqflist([])
|
||||||
|
" move line
|
||||||
|
move+1
|
||||||
|
END
|
||||||
|
call writefile(script, 'XTest_autocmd_invalidates_undo_on_textchanged', 'D')
|
||||||
|
let buf = RunVimInTerminal('XTest_autocmd_invalidates_undo_on_textchanged', {'rows': 20})
|
||||||
|
call term_sendkeys(buf, ":so %\<cr>")
|
||||||
|
call term_sendkeys(buf, "G")
|
||||||
|
call WaitForAssert({-> assert_match('^XTest_autocmd_invalidates_undo_on_textchanged\s*$', term_getline(buf, 20))}, 1000)
|
||||||
|
|
||||||
|
call StopVimInTerminal(buf)
|
||||||
|
endfunc
|
||||||
|
|
||||||
" vim: shiftwidth=2 sts=2 expandtab
|
" vim: shiftwidth=2 sts=2 expandtab
|
||||||
|
@@ -704,6 +704,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 */
|
||||||
|
/**/
|
||||||
|
112,
|
||||||
/**/
|
/**/
|
||||||
111,
|
111,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user