aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--runtime/doc/lsp.txt2
-rw-r--r--runtime/doc/lua.txt6
-rw-r--r--runtime/lua/vim/lsp/buf.lua2
-rw-r--r--src/nvim/api/command.c2
-rw-r--r--src/nvim/globals.h2
-rw-r--r--src/nvim/memory.c2
-rw-r--r--src/nvim/menu.c1
-rw-r--r--src/nvim/normal.c7
-rw-r--r--src/nvim/ops.c7
-rw-r--r--src/nvim/option.c2
10 files changed, 14 insertions, 19 deletions
diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt
index 4f07752cb6..ee8424461e 100644
--- a/runtime/doc/lsp.txt
+++ b/runtime/doc/lsp.txt
@@ -99,7 +99,7 @@ To learn what capabilities are available you can run the following command in
a buffer with a started LSP client:
>
- :lua =vim.lsp.get_active_clients()[1].server_capabilties
+ :lua =vim.lsp.get_active_clients()[1].server_capabilities
<
Full list of features provided by default can be found in |lsp-buf|.
diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index c9fd3d2786..9f8d4a8479 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -291,7 +291,7 @@ The Lua print() function redirects its output to the Nvim message area, with
arguments separated by " " (space) instead of "\t" (tab).
*:lua*
-:[range]lua {chunk}
+:lua {chunk}
Executes Lua chunk {chunk}.
If {chunk} starts with "=" the rest of the chunk is
evaluated as an expression and printed. `:lua =expr`
@@ -304,7 +304,7 @@ arguments separated by " " (space) instead of "\t" (tab).
:lua =jit.version
<
*:lua-heredoc*
-:[range]lua << [endmarker]
+:lua << [endmarker]
{script}
{endmarker}
Executes Lua script {script} from within Vimscript.
@@ -345,7 +345,7 @@ arguments separated by " " (space) instead of "\t" (tab).
:luado if bp:match(line) then return "-->\t" .. line end
<
*:luafile*
-:[range]luafile {file}
+:luafile {file}
Execute Lua script in {file}.
The whole argument is used as the filename (like
|:edit|), spaces do not need to be escaped.
diff --git a/runtime/lua/vim/lsp/buf.lua b/runtime/lua/vim/lsp/buf.lua
index fa8ee23805..97c30bc46a 100644
--- a/runtime/lua/vim/lsp/buf.lua
+++ b/runtime/lua/vim/lsp/buf.lua
@@ -708,7 +708,7 @@ local function on_code_action_results(results, ctx, options)
end
local found = false
for _, o in ipairs(options.context.only) do
- -- action kinds are hierachical with . as a separator: when requesting only
+ -- action kinds are hierarchical with . as a separator: when requesting only
-- 'quickfix' this filter allows both 'quickfix' and 'quickfix.foo', for example
if a.kind:find('^' .. o .. '$') or a.kind:find('^' .. o .. '%.') then
found = true
diff --git a/src/nvim/api/command.c b/src/nvim/api/command.c
index 0d2e013aac..141e1256ff 100644
--- a/src/nvim/api/command.c
+++ b/src/nvim/api/command.c
@@ -650,7 +650,7 @@ static bool string_iswhite(String str)
// Found a non-whitespace character
return false;
} else if (str.data[i] == NUL) {
- // Terminate at first occurence of a NUL character
+ // Terminate at first occurrence of a NUL character
break;
}
}
diff --git a/src/nvim/globals.h b/src/nvim/globals.h
index 7830e9caea..a2862edd6b 100644
--- a/src/nvim/globals.h
+++ b/src/nvim/globals.h
@@ -709,7 +709,7 @@ EXTERN typebuf_T typebuf INIT(= { NULL, NULL, 0, 0, 0, 0, 0, 0, 0 });
EXTERN int ex_normal_busy INIT(= 0); // recursiveness of ex_normal()
EXTERN int ex_normal_lock INIT(= 0); // forbid use of ex_normal()
EXTERN int ignore_script INIT(= false); // ignore script input
-EXTERN int stop_insert_mode; // for ":stopinsert" and 'insertmode'
+EXTERN int stop_insert_mode; // for ":stopinsert"
EXTERN bool KeyTyped; // true if user typed current char
EXTERN int KeyStuffed; // true if current char from stuffbuf
EXTERN int maptick INIT(= 0); // tick for each non-mapped char
diff --git a/src/nvim/memory.c b/src/nvim/memory.c
index 32c4502231..dd06419391 100644
--- a/src/nvim/memory.c
+++ b/src/nvim/memory.c
@@ -529,7 +529,7 @@ void time_to_bytes(time_t time_, uint8_t buf[8])
void arena_start(Arena *arena, ArenaMem *reuse_blk)
{
if (reuse_blk && *reuse_blk) {
- arena->cur_blk = (char *)*reuse_blk;
+ arena->cur_blk = (char *)(*reuse_blk);
*reuse_blk = NULL;
} else {
arena->cur_blk = xmalloc(ARENA_BLOCK_SIZE);
diff --git a/src/nvim/menu.c b/src/nvim/menu.c
index 01a44224e8..f4943c4031 100644
--- a/src/nvim/menu.c
+++ b/src/nvim/menu.c
@@ -453,7 +453,6 @@ static int add_menu_path(const char *const menu_path, vimmenu_T *menuarg, const
if (c == Ctrl_C) {
int len = (int)STRLEN(menu->strings[i]);
- // Append CTRL-\ CTRL-G to obey 'insertmode'.
menu->strings[i][len] = Ctrl_BSL;
menu->strings[i][len + 1] = Ctrl_G;
menu->strings[i][len + 2] = NUL;
diff --git a/src/nvim/normal.c b/src/nvim/normal.c
index 87a9e1e765..35a7ee3319 100644
--- a/src/nvim/normal.c
+++ b/src/nvim/normal.c
@@ -998,9 +998,8 @@ static int normal_execute(VimState *state, int key)
// In Select mode, typed text replaces the selection.
if (VIsual_active && VIsual_select && (vim_isprintc(s->c)
|| s->c == NL || s->c == CAR || s->c == K_KENTER)) {
- // Fake a "c"hange command. When "restart_edit" is set (e.g., because
- // 'insertmode' is set) fake a "d"elete command, Insert mode will
- // restart automatically.
+ // Fake a "c"hange command.
+ // When "restart_edit" is set fake a "d"elete command, Insert mode will restart automatically.
// Insert the typed character in the typeahead buffer, so that it can
// be mapped in Insert mode. Required for ":lmap" to work.
int len = ins_char_typebuf(vgetc_char, vgetc_mod_mask);
@@ -6772,8 +6771,6 @@ static void nv_esc(cmdarg_T *cap)
}
}
- // Don't reset "restart_edit" when 'insertmode' is set, it won't be
- // set again below when halfway through a mapping.
restart_edit = 0;
if (cmdwin_type != 0) {
diff --git a/src/nvim/ops.c b/src/nvim/ops.c
index ac13807bd3..510aa1c8ac 100644
--- a/src/nvim/ops.c
+++ b/src/nvim/ops.c
@@ -6666,9 +6666,8 @@ void do_pending_operator(cmdarg_T *cap, int old_col, bool gui_yank)
CancelRedo();
} else {
// This is a new edit command, not a restart. Need to
- // remember it to make 'insertmode' work with mappings for
- // Visual mode. But do this only once and not when typed and
- // 'insertmode' isn't set.
+ // remember it to make i_CTRL-O work with mappings for
+ // Visual mode. But do this only once and not when typed.
if (!KeyTyped) {
restart_edit_save = restart_edit;
} else {
@@ -6760,7 +6759,7 @@ void do_pending_operator(cmdarg_T *cap, int old_col, bool gui_yank)
CancelRedo();
} else {
// This is a new edit command, not a restart. Need to
- // remember it to make 'insertmode' work with mappings for
+ // remember it to make i_CTRL-O work with mappings for
// Visual mode. But do this only once.
restart_edit_save = restart_edit;
restart_edit = 0;
diff --git a/src/nvim/option.c b/src/nvim/option.c
index 8f19ebf5ba..075dd3d4bc 100644
--- a/src/nvim/option.c
+++ b/src/nvim/option.c
@@ -4593,7 +4593,7 @@ static char *set_num_option(int opt_idx, char_u *varp, long value, char *errbuf,
} else if (pp == &curwin->w_p_nuw) {
curwin->w_nrwidth_line_count = 0;
} else if (pp == &curwin->w_p_winbl && value != old_value) {
- // 'floatblend'
+ // 'winblend'
curwin->w_p_winbl = MAX(MIN(curwin->w_p_winbl, 100), 0);
curwin->w_hl_needs_update = true;
check_blending(curwin);
generated by cgit (git 2.34.1) at 2025-04-29 06:40:33 +0000