diff options
| author | Jan Edmund Lazo <janedmundlazo@hotmail.com> | 2018-10-13 21:43:43 -0400 |
|---|---|---|
| committer | Jan Edmund Lazo <janedmundlazo@hotmail.com> | 2018-10-13 21:47:41 -0400 |
| commit | e7ba32529861e2c843ad7d5fc2d2d505a9412108 (patch) | |
| tree | 030b54f770a3a1d5c46f50d4f4f20e2e3adb580c | |
| parent | c9baaa9200e95d559b91e21e0b3da087de2de629 (diff) | |
| download | rneovim-e7ba32529861e2c843ad7d5fc2d2d505a9412108.tar.gz rneovim-e7ba32529861e2c843ad7d5fc2d2d505a9412108.tar.bz2 rneovim-e7ba32529861e2c843ad7d5fc2d2d505a9412108.zip | |
vim-patch:8.0.1672: error during completion causes command to be cancelled
Problem: Error during completion causes command to be cancelled.
Solution: Reset did_emsg before waiting for another character. (Tom M.)
https://github.com/vim/vim/commit/72532d354e699f1cceec34c0b08e1de4d3ea9641
| -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() |