forked from aniani/vim
patch 8.1.0245: calling setline() in TextChangedI autocmd breaks undo
Problem: Calling setline() in TextChangedI autocmd breaks undo. (Jason
Felice)
Solution: Don't save lines for undo when already saved. (closes #3291)
This commit is contained in:
@@ -1722,11 +1722,19 @@ ins_redraw(
|
|||||||
{
|
{
|
||||||
aco_save_T aco;
|
aco_save_T aco;
|
||||||
|
|
||||||
|
// Sync undo when the autocommand calls setline() or append(), so that
|
||||||
|
// it can be undone separately.
|
||||||
|
u_sync_once = 2;
|
||||||
|
|
||||||
// save and restore curwin and curbuf, in case the autocmd changes them
|
// save and restore curwin and curbuf, in case the autocmd changes them
|
||||||
aucmd_prepbuf(&aco, curbuf);
|
aucmd_prepbuf(&aco, curbuf);
|
||||||
apply_autocmds(EVENT_TEXTCHANGEDI, NULL, NULL, FALSE, curbuf);
|
apply_autocmds(EVENT_TEXTCHANGEDI, NULL, NULL, FALSE, curbuf);
|
||||||
aucmd_restbuf(&aco);
|
aucmd_restbuf(&aco);
|
||||||
curbuf->b_last_changedtick = CHANGEDTICK(curbuf);
|
curbuf->b_last_changedtick = CHANGEDTICK(curbuf);
|
||||||
|
|
||||||
|
if (u_sync_once == 1)
|
||||||
|
ins_need_undo = TRUE;
|
||||||
|
u_sync_once = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef FEAT_INS_EXPAND
|
#ifdef FEAT_INS_EXPAND
|
||||||
|
|||||||
@@ -587,7 +587,7 @@ func Test_OptionSet()
|
|||||||
" Cleanup
|
" Cleanup
|
||||||
au! OptionSet
|
au! OptionSet
|
||||||
for opt in ['nu', 'ai', 'acd', 'ar', 'bs', 'backup', 'cul', 'cp']
|
for opt in ['nu', 'ai', 'acd', 'ar', 'bs', 'backup', 'cul', 'cp']
|
||||||
exe printf(":set %s&vi", opt)
|
exe printf(":set %s&vim", opt)
|
||||||
endfor
|
endfor
|
||||||
call test_override('starting', 0)
|
call test_override('starting', 0)
|
||||||
delfunc! AutoCommandOptionSet
|
delfunc! AutoCommandOptionSet
|
||||||
@@ -1313,6 +1313,31 @@ func Test_ChangedP()
|
|||||||
bw!
|
bw!
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
|
let g:setline_handled = v:false
|
||||||
|
func! SetLineOne()
|
||||||
|
if !g:setline_handled
|
||||||
|
call setline(1, "(x)")
|
||||||
|
let g:setline_handled = v:true
|
||||||
|
endif
|
||||||
|
endfunc
|
||||||
|
|
||||||
|
func Test_TextChangedI_with_setline()
|
||||||
|
new
|
||||||
|
call test_override('char_avail', 1)
|
||||||
|
autocmd TextChangedI <buffer> call SetLineOne()
|
||||||
|
call feedkeys("i(\<CR>\<Esc>", 'tx')
|
||||||
|
call assert_equal('(', getline(1))
|
||||||
|
call assert_equal('x)', getline(2))
|
||||||
|
undo
|
||||||
|
call assert_equal('(', getline(1))
|
||||||
|
call assert_equal('', getline(2))
|
||||||
|
undo
|
||||||
|
call assert_equal('', getline(1))
|
||||||
|
|
||||||
|
call test_override('starting', 0)
|
||||||
|
bwipe!
|
||||||
|
endfunc
|
||||||
|
|
||||||
func Test_Changed_FirstTime()
|
func Test_Changed_FirstTime()
|
||||||
if !has('terminal') || has('gui_running')
|
if !has('terminal') || has('gui_running')
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -794,6 +794,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 */
|
||||||
|
/**/
|
||||||
|
245,
|
||||||
/**/
|
/**/
|
||||||
244,
|
244,
|
||||||
/**/
|
/**/
|
||||||
|
|||||||
Reference in New Issue
Block a user