forked from aniani/vim
patch 8.1.1189: mode is not cleared when leaving Insert mode
Problem: Mode is not cleared when leaving Insert mode. Solution: Clear the mode when got_int is set. (Ozaki Kiichi, closes #4270)
This commit is contained in:
@@ -4564,7 +4564,7 @@ ins_esc(
|
|||||||
*/
|
*/
|
||||||
if (reg_recording != 0 || restart_edit != NUL)
|
if (reg_recording != 0 || restart_edit != NUL)
|
||||||
showmode();
|
showmode();
|
||||||
else if (p_smd && !skip_showmode())
|
else if (p_smd && (got_int || !skip_showmode()))
|
||||||
msg("");
|
msg("");
|
||||||
|
|
||||||
return TRUE; /* exit Insert mode */
|
return TRUE; /* exit Insert mode */
|
||||||
|
@@ -18,7 +18,7 @@ func Test_setbufline_getbufline()
|
|||||||
let b = bufnr('%')
|
let b = bufnr('%')
|
||||||
wincmd w
|
wincmd w
|
||||||
call assert_equal(1, setbufline(b, 5, ['x']))
|
call assert_equal(1, setbufline(b, 5, ['x']))
|
||||||
call assert_equal(1, setbufline(1234, 1, ['x']))
|
call assert_equal(1, setbufline(bufnr('$') + 1, 1, ['x']))
|
||||||
call assert_equal(0, setbufline(b, 4, ['d', 'e']))
|
call assert_equal(0, setbufline(b, 4, ['d', 'e']))
|
||||||
call assert_equal(['c'], getbufline(b, 3))
|
call assert_equal(['c'], getbufline(b, 3))
|
||||||
call assert_equal(['d'], getbufline(b, 4))
|
call assert_equal(['d'], getbufline(b, 4))
|
||||||
|
@@ -1,5 +1,7 @@
|
|||||||
" Tests for :messages, :echomsg, :echoerr
|
" Tests for :messages, :echomsg, :echoerr
|
||||||
|
|
||||||
|
source shared.vim
|
||||||
|
|
||||||
function Test_messages()
|
function Test_messages()
|
||||||
let oldmore = &more
|
let oldmore = &more
|
||||||
try
|
try
|
||||||
@@ -92,3 +94,34 @@ func Test_echoerr()
|
|||||||
call assert_match("function('<lambda>\\d*')", execute(':echoerr {-> 1234}'))
|
call assert_match("function('<lambda>\\d*')", execute(':echoerr {-> 1234}'))
|
||||||
call test_ignore_error('RESET')
|
call test_ignore_error('RESET')
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
|
func Test_mode_message_at_leaving_insert_by_ctrl_c()
|
||||||
|
if !has('terminal') || has('gui_running')
|
||||||
|
return
|
||||||
|
endif
|
||||||
|
|
||||||
|
" Set custom statusline built by user-defined function.
|
||||||
|
let testfile = 'Xtest.vim'
|
||||||
|
call writefile([
|
||||||
|
\ 'func StatusLine() abort',
|
||||||
|
\ ' return ""',
|
||||||
|
\ 'endfunc',
|
||||||
|
\ 'set statusline=%!StatusLine()',
|
||||||
|
\ 'set laststatus=2',
|
||||||
|
\ ], testfile)
|
||||||
|
|
||||||
|
let rows = 10
|
||||||
|
let buf = term_start([GetVimProg(), '--clean', '-S', testfile], {'term_rows': rows})
|
||||||
|
call term_wait(buf, 200)
|
||||||
|
call assert_equal('run', job_status(term_getjob(buf)))
|
||||||
|
|
||||||
|
call term_sendkeys(buf, "i")
|
||||||
|
call WaitForAssert({-> assert_match('^-- INSERT --\s*$', term_getline(buf, rows))})
|
||||||
|
call term_sendkeys(buf, "\<C-C>")
|
||||||
|
call WaitForAssert({-> assert_match('^\s*$', term_getline(buf, rows))})
|
||||||
|
|
||||||
|
call term_sendkeys(buf, ":qall!\<CR>")
|
||||||
|
call WaitForAssert({-> assert_equal('dead', job_status(term_getjob(buf)))})
|
||||||
|
exe buf . 'bwipe!'
|
||||||
|
call delete(testfile)
|
||||||
|
endfunc
|
||||||
|
@@ -771,6 +771,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 */
|
||||||
|
/**/
|
||||||
|
1189,
|
||||||
/**/
|
/**/
|
||||||
1188,
|
1188,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user