diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-12-31 15:40:06 -0500 |
|---|---|---|
| committer | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-12-31 16:44:53 -0500 |
| commit | 27548e3cd04a789951decfe6de55f9cf88f516c4 (patch) | |
| tree | 97d6c02bf2538cde141c84dca99d73b8c15d9f54 /src | |
| parent | 723e009214ab321ad75051d3c36e3379b1c5e5a8 (diff) | |
| download | rneovim-27548e3cd04a789951decfe6de55f9cf88f516c4.tar.gz rneovim-27548e3cd04a789951decfe6de55f9cf88f516c4.tar.bz2 rneovim-27548e3cd04a789951decfe6de55f9cf88f516c4.zip | |
Revert "vim-patch:8.1.1189: mode is not cleared when leaving Insert mode"
This reverts commit 4afddb8f571d9e61eab60596c59a27452e9bc839.
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/edit.c | 2 | ||||
| -rw-r--r-- | src/nvim/testdir/test_bufline.vim | 2 | ||||
| -rw-r--r-- | src/nvim/testdir/test_messages.vim | 31 |
3 files changed, 2 insertions, 33 deletions
diff --git a/src/nvim/edit.c b/src/nvim/edit.c index 962ef9b245..fb06fc8859 100644 --- a/src/nvim/edit.c +++ b/src/nvim/edit.c @@ -7803,7 +7803,7 @@ static bool ins_esc(long *count, int cmdchar, bool nomove) // Otherwise remove the mode message. if (reg_recording != 0 || restart_edit != NUL) { showmode(); - } else if (p_smd && (got_int || !skip_showmode())) { + } else if (p_smd && !skip_showmode()) { MSG(""); } // Exit Insert mode diff --git a/src/nvim/testdir/test_bufline.vim b/src/nvim/testdir/test_bufline.vim index 2567dd2be2..076f03fdd8 100644 --- a/src/nvim/testdir/test_bufline.vim +++ b/src/nvim/testdir/test_bufline.vim @@ -19,7 +19,7 @@ func Test_setbufline_getbufline() let b = bufnr('%') wincmd w call assert_equal(1, setbufline(b, 5, ['x'])) - call assert_equal(1, setbufline(bufnr('$') + 1, 1, ['x'])) + call assert_equal(1, setbufline(1234, 1, ['x'])) call assert_equal(0, setbufline(b, 4, ['d', 'e'])) call assert_equal(['c'], getbufline(b, 3)) call assert_equal(['d'], getbufline(b, 4)) diff --git a/src/nvim/testdir/test_messages.vim b/src/nvim/testdir/test_messages.vim index 4051288c7f..30239a90c2 100644 --- a/src/nvim/testdir/test_messages.vim +++ b/src/nvim/testdir/test_messages.vim @@ -89,37 +89,6 @@ func Test_echoerr() call test_ignore_error('RESET') 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 - func Test_echospace() set noruler noshowcmd laststatus=1 call assert_equal(&columns - 1, v:echospace) |