diff --git a/runtime/tutor/tutor.tutor b/runtime/tutor/tutor.tutor
index c937bd686a..b46fcc4836 100644
--- a/runtime/tutor/tutor.tutor
+++ b/runtime/tutor/tutor.tutor
@@ -118,7 +118,7 @@ and are hidden by default. Links to them look like
\[label\]\(\*anchor\*\)
-6. Add the appropiate link:
+6. Add the appropriate link:
A link to the Links section
A link to the [Links](*links*) section
diff --git a/scripts/lua2dox.lua b/scripts/lua2dox.lua
index 438f734917..171621e38d 100644
--- a/scripts/lua2dox.lua
+++ b/scripts/lua2dox.lua
@@ -65,7 +65,7 @@ FILTER_PATTERNS = *.lua=lua2dox_filter
Either add them to the end or find the appropriate entry in Doxyfile.
-There are other lines that you might like to alter, but see futher documentation for details.
+There are other lines that you might like to alter, but see further documentation for details.
When Doxyfile is edited run "doxygen"
diff --git a/src/nvim/lua/converter.c b/src/nvim/lua/converter.c
index 44fe60e9c8..09d1a68898 100644
--- a/src/nvim/lua/converter.c
+++ b/src/nvim/lua/converter.c
@@ -1225,7 +1225,7 @@ GENERATE_INDEX_FUNCTION(Tabpage)
#undef GENERATE_INDEX_FUNCTION
-/// Record some auxilary values in vim module
+/// Record some auxiliary values in vim module
///
/// Assumes that module table is on top of the stack.
///
diff --git a/src/nvim/mark_extended.c b/src/nvim/mark_extended.c
index 91c2f919ce..17776d438a 100644
--- a/src/nvim/mark_extended.c
+++ b/src/nvim/mark_extended.c
@@ -4,7 +4,7 @@
// Implements extended marks for plugins. Each mark exists in a btree of
// lines containing btrees of columns.
//
-// The btree provides efficent range lookups.
+// The btree provides efficient range lookups.
// A map of pointers to the marks is used for fast lookup by mark id.
//
// Marks are moved by calls to: extmark_col_adjust, extmark_adjust, or
@@ -300,7 +300,7 @@ Extmark *extmark_from_pos(buf_T *buf, uint64_t ns, linenr_T lnum, colnr_T col)
return NULL;
}
-// Returns an avaliable id in a namespace
+// Returns an available id in a namespace
uint64_t extmark_free_id_get(buf_T *buf, uint64_t ns)
{
if (!buf->b_extmark_ns) {
diff --git a/src/nvim/os_unix.c b/src/nvim/os_unix.c
index ded575529f..0f44df2188 100644
--- a/src/nvim/os_unix.c
+++ b/src/nvim/os_unix.c
@@ -412,7 +412,7 @@ int mch_expand_wildcards(int num_pat, char_u **pat, int *num_file,
fseek(fd, 0L, SEEK_SET);
buffer = xmalloc(len + 1);
// fread() doesn't terminate buffer with NUL;
- // appropiate termination (not always NUL) is done below.
+ // appropriate termination (not always NUL) is done below.
size_t readlen = fread((char *)buffer, 1, len, fd);
fclose(fd);
os_remove((char *)tempname);
diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index 7b9601a5a6..e9be7eed38 100644
--- a/src/nvim/screen.c
+++ b/src/nvim/screen.c
@@ -124,7 +124,7 @@
// temporary buffer for rendering a single screenline, so it can be
-// comparared with previous contents to calulate smallest delta.
+// comparared with previous contents to calculate smallest delta.
static size_t linebuf_size = 0;
static schar_T *linebuf_char = NULL;
static sattr_T *linebuf_attr = NULL;
diff --git a/src/nvim/syntax.c b/src/nvim/syntax.c
index bdbc09a87a..61ee225eba 100644
--- a/src/nvim/syntax.c
+++ b/src/nvim/syntax.c
@@ -7316,7 +7316,7 @@ static void set_hl_attr(int idx)
sgp->sg_attr = hl_get_syn_attr(idx+1, at_en);
- // a cursor style uses this syn_id, make sure its atribute is updated.
+ // a cursor style uses this syn_id, make sure its attribute is updated.
if (cursor_mode_uses_syn_id(idx+1)) {
ui_mode_info_set();
}
diff --git a/src/nvim/testdir/test_search.vim b/src/nvim/testdir/test_search.vim
index 5d4c2a015f..68eb311e3c 100644
--- a/src/nvim/testdir/test_search.vim
+++ b/src/nvim/testdir/test_search.vim
@@ -57,7 +57,7 @@ func Test_search_cmdline()
call feedkeys("/the".repeat("\", 6)."\", 'tx')
call assert_equal(' 8 them', getline('.'))
:1
- " eigth match
+ " eighth match
call feedkeys("/the".repeat("\", 7)."\", 'tx')
call assert_equal(' 9 these', getline('.'))
:1
@@ -99,7 +99,7 @@ func Test_search_cmdline()
call feedkeys("/the".repeat("\", 6)."\", 'tx')
call assert_equal(' 8 them', getline('.'))
:1
- " eigth match
+ " eighth match
call feedkeys("/the".repeat("\", 7)."\", 'tx')
call assert_equal(' 9 these', getline('.'))
:1
diff --git a/src/nvim/ui_compositor.c b/src/nvim/ui_compositor.c
index 7d3ecfa0b8..e582d8f859 100644
--- a/src/nvim/ui_compositor.c
+++ b/src/nvim/ui_compositor.c
@@ -626,7 +626,7 @@ static void ui_comp_grid_scroll(UI *ui, Integer grid, Integer top,
if (covered || curgrid->blending) {
// TODO(bfredl):
// 1. check if rectangles actually overlap
- // 2. calulate subareas that can scroll.
+ // 2. calculate subareas that can scroll.
compose_debug(top, bot, left, right, dbghl_recompose, true);
for (int r = (int)(top + MAX(-rows, 0)); r < bot - MAX(rows, 0); r++) {
// TODO(bfredl): workaround for win_update() performing two scrolls in a
diff --git a/test/functional/api/mark_extended_spec.lua b/test/functional/api/mark_extended_spec.lua
index edb0f8ac2b..bf910568b1 100644
--- a/test/functional/api/mark_extended_spec.lua
+++ b/test/functional/api/mark_extended_spec.lua
@@ -507,7 +507,7 @@ describe('API/extmarks', function()
feed('0l3dl')
check_undo_redo(ns, marks[1], 0, 2, 0, 1)
check_undo_redo(ns, marks[2], 0, 3, 0, 1)
- -- delete 1, nothing should happend to our marks
+ -- delete 1, nothing should happen to our marks
feed('u')
feed('$x')
check_undo_redo(ns, marks[2], 0, 3, 0, 3)
@@ -543,7 +543,7 @@ describe('API/extmarks', function()
check_undo_redo(ns, marks[1], 0, 1, 0, 0)
check_undo_redo(ns, marks[2], 0, 3, 0, 0)
check_undo_redo(ns, marks[3], 1, 2, 1, 0)
- -- delete 1, nothing should happend to our marks
+ -- delete 1, nothing should happen to our marks
feed('u')
feed('$jx')
check_undo_redo(ns, marks[2], 0, 3, 0, 3)
diff --git a/test/functional/autocmd/cmdline_spec.lua b/test/functional/autocmd/cmdline_spec.lua
index 51b7b819e9..8ec06dc148 100644
--- a/test/functional/autocmd/cmdline_spec.lua
+++ b/test/functional/autocmd/cmdline_spec.lua
@@ -33,7 +33,7 @@ describe('cmdline autocommands', function()
eq({'notification', 'CmdlineEnter', {{cmdtype=':', cmdlevel=1}}}, next_msg())
-- note: feed('bork') might not consume 'bork'
- -- due to out-of-band interupt handling
+ -- due to out-of-band interrupt handling
feed('bork')
eq({'notification', 'CmdlineLeave',
{{cmdtype=':', cmdlevel=1, abort=true}}}, next_msg())
diff --git a/test/functional/cmdline/history_spec.lua b/test/functional/cmdline/history_spec.lua
index 20f9cf06a2..ee2d36f642 100644
--- a/test/functional/cmdline/history_spec.lua
+++ b/test/functional/cmdline/history_spec.lua
@@ -6,7 +6,7 @@ describe('history support code', function()
before_each(clear)
it('correctly clears start of the history', function()
- -- Regression test: check absense of the memory leak when clearing start of
+ -- Regression test: check absence of the memory leak when clearing start of
-- the history using ex_getln.c/clr_history().
eq(1, funcs.histadd(':', 'foo'))
eq(1, funcs.histdel(':'))
@@ -14,7 +14,7 @@ describe('history support code', function()
end)
it('correctly clears end of the history', function()
- -- Regression test: check absense of the memory leak when clearing end of
+ -- Regression test: check absence of the memory leak when clearing end of
-- the history using ex_getln.c/clr_history().
meths.set_option('history', 1)
eq(1, funcs.histadd(':', 'foo'))
diff --git a/test/functional/ui/cmdline_spec.lua b/test/functional/ui/cmdline_spec.lua
index c2354103c2..21c01b3458 100644
--- a/test/functional/ui/cmdline_spec.lua
+++ b/test/functional/ui/cmdline_spec.lua
@@ -775,7 +775,7 @@ local function test_cmdline(linegrid)
}}}
-- This used to send an invalid event where pos where larger than the total
- -- lenght of content. Checked in _handle_cmdline_show.
+ -- length of content. Checked in _handle_cmdline_show.
feed('')
screen:expect([[
^ |
diff --git a/test/functional/ui/searchhl_spec.lua b/test/functional/ui/searchhl_spec.lua
index 486de02a09..635ce7392b 100644
--- a/test/functional/ui/searchhl_spec.lua
+++ b/test/functional/ui/searchhl_spec.lua
@@ -442,7 +442,7 @@ describe('search highlighting', function()
feed_command("call matchadd('MyGroup', 'special')")
feed_command("call matchadd('MyGroup2', 'text', 0)")
- -- searchhl and matchadd matches are exclusive, only the higest priority
+ -- searchhl and matchadd matches are exclusive, only the highest priority
-- is used (and matches with lower priorities are not combined)
feed_command("/ial te")
screen:expect([[
diff --git a/test/unit/os/env_spec.lua b/test/unit/os/env_spec.lua
index c543551607..e24a389d69 100644
--- a/test/unit/os/env_spec.lua
+++ b/test/unit/os/env_spec.lua
@@ -121,7 +121,7 @@ describe('env.c', function()
local name = 'NVIM_UNIT_TEST_GETENV_1N'
local value = 'NVIM_UNIT_TEST_GETENV_1V'
eq(NULL, os_getenv(name))
- -- Use os_setenv because Lua dosen't have setenv.
+ -- Use os_setenv because Lua doesn't have setenv.
os_setenv(name, value, 1)
eq(value, os_getenv(name))