Mercurial > vim
changeset 30761:c9b31c8eb3b3 v9.0.0715
patch 9.0.0715: wrong argument for append() gives two error messages
Commit: https://github.com/vim/vim/commit/801cd35e7e3b21e519e12a1610ee1d721e40893e
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Oct 10 16:08:16 2022 +0100
patch 9.0.0715: wrong argument for append() gives two error messages
Problem: Wrong argument for append() gives two error messages.
Solution: When getting an error for a number argument don't try using it as
a string. (closes #11335)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Mon, 10 Oct 2022 17:15:07 +0200 |
| parents | 2d5c453965b9 |
| children | df5ddde37685 |
| files | src/testdir/test_functions.vim src/typval.c src/version.c |
| diffstat | 3 files changed, 7 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/test_functions.vim +++ b/src/testdir/test_functions.vim @@ -950,6 +950,8 @@ func Test_append() " Using $ instead of '$' must give an error call assert_fails("call append($, 'foobar')", 'E116:') + + call assert_fails("call append({}, '')", ['E728:', 'E728:']) endfunc " Test for setline()
--- a/src/typval.c +++ b/src/typval.c @@ -2509,10 +2509,12 @@ eval_env_var(char_u **arg, typval_T *ret tv_get_lnum(typval_T *argvars) { linenr_T lnum = -1; + int did_emsg_before = did_emsg; if (argvars[0].v_type != VAR_STRING || !in_vim9script()) lnum = (linenr_T)tv_get_number_chk(&argvars[0], NULL); - if (lnum <= 0 && argvars[0].v_type != VAR_NUMBER) + if (lnum <= 0 && did_emsg_before == did_emsg + && argvars[0].v_type != VAR_NUMBER) { int fnum; pos_T *fp;