diff options
| author | Sean Dewar <seandewar@users.noreply.github.com> | 2022-01-01 08:07:13 +0000 |
|---|---|---|
| committer | Sean Dewar <seandewar@users.noreply.github.com> | 2022-02-05 19:55:17 +0000 |
| commit | 8adbba7ac38d7a0b4e1f602f6522b9403c11fc7e (patch) | |
| tree | ea54f4cbb525ee50926add414c1d903e8495b513 | |
| parent | 83a48d7a44c69a8b159bdcf90029005f2f4a8de5 (diff) | |
| download | rneovim-8adbba7ac38d7a0b4e1f602f6522b9403c11fc7e.tar.gz rneovim-8adbba7ac38d7a0b4e1f602f6522b9403c11fc7e.tar.bz2 rneovim-8adbba7ac38d7a0b4e1f602f6522b9403c11fc7e.zip | |
feat(eval): port emsg from v8.2.3284
https://github.com/vim/vim/commit/80d7395dcfe96158428da6bb3d28a6eee1244e28
| -rw-r--r-- | src/nvim/eval.c | 3 | ||||
| -rw-r--r-- | src/nvim/testdir/test_eval_stuff.vim | 8 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index b4baeb5240..93d34cf86f 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -69,6 +69,7 @@ static char *e_nowhitespace static char *e_invalwindow = N_("E957: Invalid window number"); static char *e_lock_unlock = N_("E940: Cannot lock or unlock variable %s"); static char *e_write2 = N_("E80: Error while writing: %s"); +static char *e_string_list_or_blob_required = N_("E1098: String, List or Blob required"); // TODO(ZyX-I): move to eval/executor static char *e_letwrong = N_("E734: Wrong variable type for %s="); @@ -2651,7 +2652,7 @@ void *eval_for_line(const char_u *arg, bool *errp, char_u **nextcmdp, int skip) fi->fi_string = vim_strsave((char_u *)""); } } else { - emsg(_(e_listblobreq)); + emsg(_(e_string_list_or_blob_required)); tv_clear(&tv); } } diff --git a/src/nvim/testdir/test_eval_stuff.vim b/src/nvim/testdir/test_eval_stuff.vim index 883ba5de3d..95eccde35c 100644 --- a/src/nvim/testdir/test_eval_stuff.vim +++ b/src/nvim/testdir/test_eval_stuff.vim @@ -65,11 +65,9 @@ func Test_E963() endfunc func Test_for_invalid() - " Vim gives incorrect emsg here until v8.2.3284, but the exact emsg from that - " patch cannot be used until v8.2.2658 is ported (for loop over Strings) - call assert_fails("for x in 99", 'E897:') - call assert_fails("for x in function('winnr')", 'E897:') - call assert_fails("for x in {'a': 9}", 'E897:') + call assert_fails("for x in 99", 'E1098:') + call assert_fails("for x in function('winnr')", 'E1098:') + call assert_fails("for x in {'a': 9}", 'E1098:') if 0 /1/5/2/s/\n |