aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--runtime/doc/api.txt4
-rw-r--r--runtime/doc/lua-guide.txt16
-rw-r--r--runtime/doc/news.txt6
-rw-r--r--runtime/doc/quickfix.txt2
-rw-r--r--runtime/lua/nvim/health.lua2
-rw-r--r--src/nvim/api/extmark.c2
-rw-r--r--src/nvim/api/vim.c2
-rw-r--r--src/nvim/generators/gen_api_dispatch.lua4
-rw-r--r--src/nvim/window.c2
-rw-r--r--test/functional/legacy/memory_usage_spec.lua4
10 files changed, 22 insertions, 22 deletions
diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index 32c7ba67a5..fcd9bd0fe5 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -728,7 +728,7 @@ nvim_echo({chunks}, {history}, {*opts}) *nvim_echo()*
• {opts} Optional parameters.
• verbose: Message was printed as a result of 'verbose'
option if Nvim was invoked with -V3log_file, the message
- will be redirected to the log_file and surpressed from
+ will be redirected to the log_file and suppressed from
direct output.
nvim_err_write({str}) *nvim_err_write()*
@@ -2549,7 +2549,7 @@ nvim_buf_get_extmarks({buffer}, {ns_id}, {start}, {end}, {opts})
-- Create new extmark at line 1, column 1.
local m1 = a.nvim_buf_set_extmark(0, ns, 0, 0, {})
-- Create new extmark at line 3, column 1.
- local m2 = a.nvim_buf_set_extmark(0, ns, 0, 2, {})
+ local m2 = a.nvim_buf_set_extmark(0, ns, 2, 0, {})
-- Get extmarks only from line 3.
local ms = a.nvim_buf_get_extmarks(0, ns, {2,0}, {2,0}, {})
-- Get all marks in this buffer + namespace.
diff --git a/runtime/doc/lua-guide.txt b/runtime/doc/lua-guide.txt
index b0b2857300..71dc48b715 100644
--- a/runtime/doc/lua-guide.txt
+++ b/runtime/doc/lua-guide.txt
@@ -285,7 +285,7 @@ work:
Instead, you need to create an intermediate Lua table and change this:
>lua
local temp_table = vim.g.some_global_variable
- temp_table = keys = 400
+ temp_table.key2 = 400
vim.g.some_global_variable = temp_table
vim.pretty_print(vim.g.some_global_variable)
--> { key1 = "value", key2 = 400 }
@@ -408,7 +408,7 @@ mandatory arguments:
• {lhs} is a string with the key sequences that should trigger the mapping.
An empty string is equivalent to |<Nop>|, which disables a key.
• {rhs} is either a string with a Vim command or a Lua function that should
- be execucted when the {lhs} is entered.
+ be executed when the {lhs} is entered.
Examples:
>lua
@@ -608,25 +608,25 @@ may be reloaded is
This is equivalent to the following Lua code:
>lua
local mygroup = vim.api.nvim_create_augroup('vimrc', { clear = true })
- vim.api.nvim_create_autocmd( {'BufNewFile', 'BufRead' }, {
+ vim.api.nvim_create_autocmd({ 'BufNewFile', 'BufRead' }, {
pattern = '*.html',
group = mygroup,
- cmd = 'set shiftwidth=4',
+ command = 'set shiftwidth=4',
})
- vim.api.nvim_create_autocmd( {'BufNewFile', 'BufRead' }, {
+ vim.api.nvim_create_autocmd({ 'BufNewFile', 'BufRead' }, {
pattern = '*.html',
group = 'vimrc', -- equivalent to group=mygroup
- cmd = 'set expandtab',
+ command = 'set expandtab',
})
<
Autocommand groups are unique for a given name, so you can reuse them, e.g.,
in a different file:
>lua
local mygroup = vim.api.nvim_create_augroup('vimrc', { clear = false })
- vim.api.nvim_create_autocmd( {'BufNewFile', 'BufRead' }, {
+ vim.api.nvim_create_autocmd({ 'BufNewFile', 'BufRead' }, {
pattern = '*.html',
group = mygroup,
- cmd = 'set shiftwidth=4',
+ command = 'set shiftwidth=4',
})
<
------------------------------------------------------------------------------
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 03bbf1567b..a764b2b882 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -60,7 +60,7 @@ The following new APIs or features were added.
• Added a |vim.lsp.codelens.clear()| function to clear codelenses.
• |vim.inspect_pos()|, |vim.show_pos()| and |:Inspect| allow a user to get or show items
- at a given buffer postion. Currently this includes treesitter captures,
+ at a given buffer position. Currently this includes treesitter captures,
semantic tokens, syntax groups and extmarks.
• Added support for semantic token highlighting to the LSP client. This
@@ -124,7 +124,7 @@ The following new APIs or features were added.
• |--remote-ui| option was added to connect to a remote instance and display
in it in a |TUI| in the local terminal. This can be used run a headless nvim
instance in the background and display its UI on demand, which previously
- only was possible usiing a external UI implementation.
+ only was possible using an external UI implementation.
==============================================================================
CHANGED FEATURES *news-changes*
@@ -140,7 +140,7 @@ The following changes to existing APIs or features add new behavior.
Previously, the TUI could be disabled as a build time feature (+tui/-tui),
resulting in a nvim binary which only could be run headless or embedded
- in an external process. As of this version, TUI is always avalibale.
+ in an external process. As of this version, TUI is always available.
==============================================================================
REMOVED FEATURES *news-removed*
diff --git a/runtime/doc/quickfix.txt b/runtime/doc/quickfix.txt
index a30f32b75e..b1f7c927cc 100644
--- a/runtime/doc/quickfix.txt
+++ b/runtime/doc/quickfix.txt
@@ -1265,7 +1265,7 @@ The .NET CLI compiler outputs both errors and warnings by default. The output
may be limited to include only errors, by setting the g:dotnet_errors_only
variable to |v:true|.
-The associated project name is included in each error and warning. To supress
+The associated project name is included in each error and warning. To suppress
the project name, set the g:dotnet_show_project_file variable to |v:false|.
Example: limit output to only display errors, and suppress the project name: >
diff --git a/runtime/lua/nvim/health.lua b/runtime/lua/nvim/health.lua
index 0dd32ddc0b..c00b921d5c 100644
--- a/runtime/lua/nvim/health.lua
+++ b/runtime/lua/nvim/health.lua
@@ -1,7 +1,7 @@
local M = {}
local health = require('vim.health')
-local suggest_faq = 'https://github.com/neovim/neovim/wiki/FAQ'
+local suggest_faq = 'https://github.com/neovim/neovim/wiki/Building-Neovim#optimized-builds'
local function check_runtime()
health.report_start('Runtime')
diff --git a/src/nvim/api/extmark.c b/src/nvim/api/extmark.c
index 992c134a0f..44e7ed3986 100644
--- a/src/nvim/api/extmark.c
+++ b/src/nvim/api/extmark.c
@@ -271,7 +271,7 @@ ArrayOf(Integer) nvim_buf_get_extmark_by_id(Buffer buffer, Integer ns_id,
/// -- Create new extmark at line 1, column 1.
/// local m1 = a.nvim_buf_set_extmark(0, ns, 0, 0, {})
/// -- Create new extmark at line 3, column 1.
-/// local m2 = a.nvim_buf_set_extmark(0, ns, 0, 2, {})
+/// local m2 = a.nvim_buf_set_extmark(0, ns, 2, 0, {})
/// -- Get extmarks only from line 3.
/// local ms = a.nvim_buf_get_extmarks(0, ns, {2,0}, {2,0}, {})
/// -- Get all marks in this buffer + namespace.
diff --git a/src/nvim/api/vim.c b/src/nvim/api/vim.c
index 83c9d54725..1e8964d912 100644
--- a/src/nvim/api/vim.c
+++ b/src/nvim/api/vim.c
@@ -729,7 +729,7 @@ void nvim_set_vvar(String name, Object value, Error *err)
/// @param opts Optional parameters.
/// - verbose: Message was printed as a result of 'verbose' option
/// if Nvim was invoked with -V3log_file, the message will be
-/// redirected to the log_file and surpressed from direct output.
+/// redirected to the log_file and suppressed from direct output.
void nvim_echo(Array chunks, Boolean history, Dict(echo_opts) *opts, Error *err)
FUNC_API_SINCE(7)
{
diff --git a/src/nvim/generators/gen_api_dispatch.lua b/src/nvim/generators/gen_api_dispatch.lua
index 55ab9fdf0e..96c9b21b8f 100644
--- a/src/nvim/generators/gen_api_dispatch.lua
+++ b/src/nvim/generators/gen_api_dispatch.lua
@@ -61,7 +61,7 @@ for i = 6, #arg do
functions[#functions + 1] = tmp[j]
function_names[fn.name] = true
if #fn.parameters >= 2 and fn.parameters[2][1] == 'Array' and fn.parameters[2][2] == 'uidata' then
- -- function recieves the "args" as a parameter
+ -- function receives the "args" as a parameter
fn.receives_array_args = true
-- remove the args parameter
table.remove(fn.parameters, 2)
@@ -360,7 +360,7 @@ for i = 1, #functions do
if #args > 0 or fn.can_fail then
output:write('channel_id, ')
if fn.receives_array_args then
- -- if the function recieves the array args, pass it the second argument
+ -- if the function receives the array args, pass it the second argument
output:write('args, ')
end
output:write(call_args)
diff --git a/src/nvim/window.c b/src/nvim/window.c
index 57d40ceb42..bb915d2fc5 100644
--- a/src/nvim/window.c
+++ b/src/nvim/window.c
@@ -5414,7 +5414,7 @@ static int check_window_scroll_resize(int *size_count, win_T **first_scroll_win,
int tot_skipcol = 0;
FOR_ALL_WINDOWS_IN_TAB(wp, curtab) {
- // Skip floating windows that do not have a snapshot (usually becuase they are newly-created),
+ // Skip floating windows that do not have a snapshot (usually because they are newly-created),
// as unlike split windows, creating floating windows do not cause other windows to resize.
if (wp->w_floating && wp->w_last_topline == 0) {
wp->w_last_topline = wp->w_topline;
diff --git a/test/functional/legacy/memory_usage_spec.lua b/test/functional/legacy/memory_usage_spec.lua
index 8d9b28e1fc..59839157ea 100644
--- a/test/functional/legacy/memory_usage_spec.lua
+++ b/test/functional/legacy/memory_usage_spec.lua
@@ -166,8 +166,8 @@ describe('memory usage', function()
local last = monitor_memory_usage(pid)
-- The usage may be a bit less than the last value, use 80%.
-- Allow for 20% tolerance at the upper limit. That's very permissive, but
- -- otherwise the test fails sometimes. On Sourcehut CI with FreeBSD we need to
- -- be even much more permissive.
+ -- otherwise the test fails sometimes. On FreeBSD we need to be even much
+ -- more permissive.
local upper_multiplier = is_os('freebsd') and 19 or 12
local lower = before.last * 8 / 10
local upper = load_adjust((after.max + (after.last - before.last)) * upper_multiplier / 10)