diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2018-10-17 09:51:09 +0200 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2018-10-17 09:51:09 +0200 |
| commit | aff64b3a52d3d897c5c88270c8e78ba3d02c52f7 (patch) | |
| tree | c49fbfe8219d7e13e702ca881f9b869345e638d7 /src | |
| parent | 9642903dea68c614038b134a3806d31af032fe77 (diff) | |
| parent | 9c2d5f1a33ccf3838899425ede481c6cdb00acb5 (diff) | |
| download | rneovim-aff64b3a52d3d897c5c88270c8e78ba3d02c52f7.tar.gz rneovim-aff64b3a52d3d897c5c88270c8e78ba3d02c52f7.tar.bz2 rneovim-aff64b3a52d3d897c5c88270c8e78ba3d02c52f7.zip | |
Merge #9124 'vim-patch:8.0.1672'
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/ex_getln.c | 4 | ||||
| -rw-r--r-- | src/nvim/testdir/test_cmdline.vim | 11 |
2 files changed, 15 insertions, 0 deletions
diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c index 247b9175aa..f40131177e 100644 --- a/src/nvim/ex_getln.c +++ b/src/nvim/ex_getln.c @@ -510,6 +510,10 @@ static int command_line_check(VimState *state) // completion may switch it on. quit_more = false; // reset after CTRL-D which had a more-prompt + did_emsg = false; // There can't really be a reason why an error + // that occurs while typing a command should + // cause the command not to be executed. + cursorcmd(); // set the cursor on the right spot ui_cursor_shape(); return 1; diff --git a/src/nvim/testdir/test_cmdline.vim b/src/nvim/testdir/test_cmdline.vim index c302948ba3..26f1dcc333 100644 --- a/src/nvim/testdir/test_cmdline.vim +++ b/src/nvim/testdir/test_cmdline.vim @@ -334,6 +334,17 @@ func Test_paste_in_cmdline() call feedkeys(":\<C-\>etoupper(getline(1))\<CR>\<C-B>\"\<CR>", 'tx') call assert_equal('"ASDF.X /TMP/SOME VERYLONGWORD A;B-C*D ', @:) bwipe! + + " Error while typing a command used to cause that it was not executed + " in the end. + new + try + call feedkeys(":file \<C-R>%Xtestfile\<CR>", 'tx') + catch /^Vim\%((\a\+)\)\=:E32/ + " ignore error E32 + endtry + call assert_equal("Xtestfile", bufname("%")) + bwipe! endfunc func Test_remove_char_in_cmdline() |