aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/nvim/generators/gen_api_dispatch.lua2
-rw-r--r--src/nvim/lua/vim.lua3
-rw-r--r--src/nvim/syntax.c5
3 files changed, 7 insertions, 3 deletions
diff --git a/src/nvim/generators/gen_api_dispatch.lua b/src/nvim/generators/gen_api_dispatch.lua
index 6e80ad0e5c..b31209e8ff 100644
--- a/src/nvim/generators/gen_api_dispatch.lua
+++ b/src/nvim/generators/gen_api_dispatch.lua
@@ -250,7 +250,7 @@ for i = 1, #functions do
end
output:write('\n } else {')
output:write('\n api_set_error(error, kErrorTypeException, \
- "Wrong type for argument '..j..', expecting '..param[1]..'");')
+ "Wrong type for argument '..j..' when calling '..fn.name..', expecting '..param[1]..'");')
output:write('\n goto cleanup;')
output:write('\n }\n')
else
diff --git a/src/nvim/lua/vim.lua b/src/nvim/lua/vim.lua
index 0580fcacae..2c7ab46ffe 100644
--- a/src/nvim/lua/vim.lua
+++ b/src/nvim/lua/vim.lua
@@ -272,6 +272,9 @@ local function __index(t, key)
elseif key == 'highlight' then
t.highlight = require('vim.highlight')
return t.highlight
+ elseif key == 'F' then
+ t.F = require('vim.F')
+ return t.F
end
end
diff --git a/src/nvim/syntax.c b/src/nvim/syntax.c
index ec6accd473..5ce126a593 100644
--- a/src/nvim/syntax.c
+++ b/src/nvim/syntax.c
@@ -4296,8 +4296,9 @@ static void syn_cmd_include(exarg_T *eap, int syncing)
current_syn_inc_tag = ++running_syn_inc_tag;
prev_toplvl_grp = curwin->w_s->b_syn_topgrp;
curwin->w_s->b_syn_topgrp = sgl_id;
- if (source ? do_source(eap->arg, false, DOSO_NONE) == FAIL
- : source_in_path(p_rtp, eap->arg, DIP_ALL) == FAIL) {
+ if (source
+ ? do_source(eap->arg, false, DOSO_NONE) == FAIL
+ : source_in_path(p_rtp, eap->arg, DIP_ALL) == FAIL) {
EMSG2(_(e_notopen), eap->arg);
}
curwin->w_s->b_syn_topgrp = prev_toplvl_grp;