aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/eval.c
diff options
context:
space:
mode:
authorMatthieu Coudron <mattator@gmail.com>2020-06-06 02:05:49 +0200
committerGitHub <noreply@github.com>2020-06-06 02:05:49 +0200
commit33dafc4f0f21f763dac8f6bdbd27117666f908c5 (patch)
tree179301040b52babddbe60001bc5c9b467edc310a /src/nvim/eval.c
parentfca471d8e2573c2351151051a2d2c6eee0b2243b (diff)
parent9538a7895cb6af2312a39c4c0710ace638309914 (diff)
downloadrneovim-33dafc4f0f21f763dac8f6bdbd27117666f908c5.tar.gz
rneovim-33dafc4f0f21f763dac8f6bdbd27117666f908c5.tar.bz2
rneovim-33dafc4f0f21f763dac8f6bdbd27117666f908c5.zip
Merge pull request #12413 from janlazo/vim-8.2.0089
[RDY]vim-patch:8.0.1564,8.1.{917,1895,2018,2335},8.2.{89,491,873,892,905}
Diffstat (limited to 'src/nvim/eval.c')
-rw-r--r--src/nvim/eval.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 017d46e802..5f8f3f96f7 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -6120,7 +6120,7 @@ void common_function(typval_T *argvars, typval_T *rettv,
if (tv_list_len(list) == 0) {
arg_idx = 0;
} else if (tv_list_len(list) > MAX_FUNC_ARGS) {
- emsg_funcname((char *)e_toomanyarg, name);
+ emsg_funcname((char *)e_toomanyarg, s);
xfree(name);
goto theend;
}
@@ -6754,6 +6754,7 @@ void mapblock_fill_dict(dict_T *const dict,
}
tv_dict_add_allocated_str(dict, S_LEN("lhs"), lhs);
tv_dict_add_nr(dict, S_LEN("noremap"), noremap_value);
+ tv_dict_add_nr(dict, S_LEN("script"), mp->m_noremap == REMAP_SCRIPT ? 1 : 0);
tv_dict_add_nr(dict, S_LEN("expr"), mp->m_expr ? 1 : 0);
tv_dict_add_nr(dict, S_LEN("silent"), mp->m_silent ? 1 : 0);
tv_dict_add_nr(dict, S_LEN("sid"), (varnumber_T)mp->m_script_ctx.sc_sid);