diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2023-04-25 21:32:12 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-25 21:32:12 +0800 |
| commit | 43c49746d9cf82dba0d56b07d39722f9ebeecf90 (patch) | |
| tree | 3d7f3aeb8522e11b55fc5ac296c9c13d370933e1 /src/nvim/search.c | |
| parent | 2e8410b7be9dce7e5fa12a442e19d548bfb260bc (diff) | |
| download | rneovim-43c49746d9cf82dba0d56b07d39722f9ebeecf90.tar.gz rneovim-43c49746d9cf82dba0d56b07d39722f9ebeecf90.tar.bz2 rneovim-43c49746d9cf82dba0d56b07d39722f9ebeecf90.zip | |
vim-patch:9.0.0335: checks for Dictionary argument often give a vague error (#23309)
Problem: Checks for Dictionary argument often give a vague error message.
Solution: Give a useful error message. (Yegappan Lakshmanan, closes vim/vim#11009)
https://github.com/vim/vim/commit/04c4c5746e15884768d2cb41370c3276a196cd4c
Cherry-pick removal of E922 from docs from patch 9.0.1403.
Co-authored-by: Yegappan Lakshmanan <yegappan@yahoo.com>
Diffstat (limited to 'src/nvim/search.c')
| -rw-r--r-- | src/nvim/search.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/nvim/search.c b/src/nvim/search.c index 694c4cad52..50e72eee86 100644 --- a/src/nvim/search.c +++ b/src/nvim/search.c @@ -2772,8 +2772,7 @@ void f_searchcount(typval_T *argvars, typval_T *rettv, EvalFuncData fptr) dictitem_T *di; bool error = false; - if (argvars[0].v_type != VAR_DICT || argvars[0].vval.v_dict == NULL) { - emsg(_(e_dictreq)); + if (tv_check_for_nonnull_dict_arg(argvars, 0) == FAIL) { return; } dict = argvars[0].vval.v_dict; @@ -3348,8 +3347,7 @@ static void do_fuzzymatch(const typval_T *const argvars, typval_T *const rettv, bool matchseq = false; long max_matches = 0; if (argvars[2].v_type != VAR_UNKNOWN) { - if (argvars[2].v_type != VAR_DICT || argvars[2].vval.v_dict == NULL) { - emsg(_(e_dictreq)); + if (tv_check_for_nonnull_dict_arg(argvars, 2) == FAIL) { return; } |