aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2023-07-21 16:30:05 +0800
committerGitHub <noreply@github.com>2023-07-21 16:30:05 +0800
commitca9f4a7cb1fea1ef1f22c011679fd8afa0a5d161 (patch)
tree1e8f5bcc01c2c2a4221a9cd5cf314a6a2b18565f
parent58f94861442d182e153ba56b63b5b9845b295d2f (diff)
downloadrneovim-ca9f4a7cb1fea1ef1f22c011679fd8afa0a5d161.tar.gz
rneovim-ca9f4a7cb1fea1ef1f22c011679fd8afa0a5d161.tar.bz2
rneovim-ca9f4a7cb1fea1ef1f22c011679fd8afa0a5d161.zip
docs: also change "vimL" and "viml" to "Vimscript" (#24414)
-rw-r--r--runtime/doc/api.txt8
-rw-r--r--scripts/gen_help_html.lua2
-rw-r--r--src/nvim/api/buffer.c4
-rw-r--r--src/nvim/api/vimscript.c2
-rw-r--r--src/nvim/lua/executor.c4
-rw-r--r--test/functional/lua/vim_spec.lua4
6 files changed, 13 insertions, 11 deletions
diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index b33d251786..5b6a901970 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -1674,8 +1674,8 @@ nvim_parse_expression({expr}, {flags}, {highlight})
stringified without "kExprNode" prefix.
• "start": a pair [line, column] describing where node is
"started" where "line" is always 0 (will not be 0 if you will be
- using nvim_parse_viml() on e.g. ":let", but that is not present
- yet). Both elements are Integers.
+ using this API on e.g. ":let", but that is not present yet).
+ Both elements are Integers.
• "len": “length” of the node. This and "start" are there for
debugging purposes primary (debugging parser and providing debug
information).
@@ -2108,8 +2108,8 @@ nvim_buf_call({buffer}, {fun}) *nvim_buf_call()*
a temporary scratch window (called the "autocmd window" for historical
reasons) will be used.
- This is useful e.g. to call vimL functions that only work with the current
- buffer/window currently, like |termopen()|.
+ This is useful e.g. to call Vimscript functions that only work with the
+ current buffer/window currently, like |termopen()|.
Attributes: ~
Lua |vim.api| only
diff --git a/scripts/gen_help_html.lua b/scripts/gen_help_html.lua
index 1b997a5614..5e06830336 100644
--- a/scripts/gen_help_html.lua
+++ b/scripts/gen_help_html.lua
@@ -34,6 +34,8 @@ local spell_dict = {
neovim = 'Nvim',
lua = 'Lua',
VimL = 'Vimscript',
+ vimL = 'Vimscript',
+ viml = 'Vimscript',
}
local language = nil
diff --git a/src/nvim/api/buffer.c b/src/nvim/api/buffer.c
index 3b73237b06..e6c91df521 100644
--- a/src/nvim/api/buffer.c
+++ b/src/nvim/api/buffer.c
@@ -1250,8 +1250,8 @@ ArrayOf(Integer, 2) nvim_buf_get_mark(Buffer buffer, String name, Error *err)
/// Otherwise a temporary scratch window (called the "autocmd window" for
/// historical reasons) will be used.
///
-/// This is useful e.g. to call vimL functions that only work with the current
-/// buffer/window currently, like |termopen()|.
+/// This is useful e.g. to call Vimscript functions that only work with the
+/// current buffer/window currently, like |termopen()|.
///
/// @param buffer Buffer handle, or 0 for current buffer
/// @param fun Function to call inside the buffer (currently Lua callable
diff --git a/src/nvim/api/vimscript.c b/src/nvim/api/vimscript.c
index eb573e2556..8a598d86f0 100644
--- a/src/nvim/api/vimscript.c
+++ b/src/nvim/api/vimscript.c
@@ -402,7 +402,7 @@ typedef kvec_withinit_t(ExprASTConvStackItem, 16) ExprASTConvStack;
/// stringified without "kExprNode" prefix.
/// - "start": a pair [line, column] describing where node is "started"
/// where "line" is always 0 (will not be 0 if you will be
-/// using nvim_parse_viml() on e.g. ":let", but that is not
+/// using this API on e.g. ":let", but that is not
/// present yet). Both elements are Integers.
/// - "len": “length” of the node. This and "start" are there for
/// debugging purposes primary (debugging parser and providing
diff --git a/src/nvim/lua/executor.c b/src/nvim/lua/executor.c
index 09392b4f60..9215926434 100644
--- a/src/nvim/lua/executor.c
+++ b/src/nvim/lua/executor.c
@@ -1139,7 +1139,7 @@ static bool viml_func_is_fast(const char *name)
if (fdef) {
return fdef->fast;
}
- // Not a vimL function
+ // Not a Vimscript function
return false;
}
@@ -1149,7 +1149,7 @@ int nlua_call(lua_State *lstate)
size_t name_len;
const char *name = luaL_checklstring(lstate, 1, &name_len);
if (!nlua_is_deferred_safe() && !viml_func_is_fast(name)) {
- return luaL_error(lstate, e_luv_api_disabled, "vimL function");
+ return luaL_error(lstate, e_luv_api_disabled, "Vimscript function");
}
int nargs = lua_gettop(lstate) - 1;
diff --git a/test/functional/lua/vim_spec.lua b/test/functional/lua/vim_spec.lua
index f168e6ba1d..77c724b8e6 100644
--- a/test/functional/lua/vim_spec.lua
+++ b/test/functional/lua/vim_spec.lua
@@ -276,7 +276,7 @@ describe('lua stdlib', function()
|
]]}
- -- nvim_command causes a vimL exception, check that it is properly caught
+ -- nvim_command causes a Vimscript exception, check that it is properly caught
-- and propagated as an error message in async contexts.. #10809
exec_lua([[
vim.schedule(function()
@@ -831,7 +831,7 @@ describe('lua stdlib', function()
it('vim.call, vim.fn', function()
eq(true, exec_lua([[return vim.call('sin', 0.0) == 0.0 ]]))
eq(true, exec_lua([[return vim.fn.sin(0.0) == 0.0 ]]))
- -- compat: nvim_call_function uses "special" value for vimL float
+ -- compat: nvim_call_function uses "special" value for Vimscript float
eq(false, exec_lua([[return vim.api.nvim_call_function('sin', {0.0}) == 0.0 ]]))
exec([[