@@ -6716,8 +6716,8 @@ A jump table for the options with a short description can be found at |Q_op|.

global

When bigger than zero, Vim will give messages about what it is doing.

Currently, these messages are given:

>= 1 When the shada file is read or written.

>= 2 When a file is ":source"'ed.

>= 1 Lua assignments to options,keymaps etc.

>= 2 When a file is ":source"'ed and when the shada file is read or written..

>= 3 UI info, terminal capabilities

>= 4 Shell commands.

>= 5 Every searched tags file and include file.

@@ -461,10 +461,11 @@ g8 Print the hex values of the bytes used in the

*:verbose-cmd*

When 'verbose' is non-zero, listing the value of a Vim option or a key map or

an abbreviation or a user-defined function or a command or a highlight group

or an autocommand will also display where it was last defined. If it was

defined manually then there will be no "Last set" message. When it was

defined while executing a function, user command or autocommand, the script in

which it was defined is reported.

or an autocommand will also display where it was last defined. If they were

defined in Lua they will only be located if 'verbose' is set. So Start

nvim with -V1 arg to see them. If it was defined manually then there

will be no "Last set" message. When it was defined while executing a function,

user command or autocommand, the script in which it was defined is reported.

*K*

[count]K Runs the program given by 'keywordprg' to lookup the

@@ -64,6 +64,7 @@ set(LUA_F_MODULE_SOURCE ${PROJECT_SOURCE_DIR}/runtime/lua/vim/F.lua)

set(LUA_META_MODULE_SOURCE ${PROJECT_SOURCE_DIR}/runtime/lua/vim/_meta.lua)

set(LUA_FILETYPE_MODULE_SOURCE ${PROJECT_SOURCE_DIR}/runtime/lua/vim/filetype.lua)

set(LUA_LOAD_PACKAGE_MODULE_SOURCE ${PROJECT_SOURCE_DIR}/runtime/lua/vim/_load_package.lua)

set(LUA_KEYMAP_MODULE_SOURCE ${PROJECT_SOURCE_DIR}/runtime/lua/vim/keymap.lua)

set(CHAR_BLOB_GENERATOR ${GENERATOR_DIR}/gen_char_blob.lua)

set(LINT_SUPPRESS_FILE ${PROJECT_BINARY_DIR}/errors.json)

set(LINT_SUPPRESS_URL_BASE "https://raw.githubusercontent.com/neovim/doc/gh-pages/reports/clint")

@@ -338,6 +339,7 @@ add_custom_command(

${LUA_META_MODULE_SOURCE} lua_meta_module

${LUA_FILETYPE_MODULE_SOURCE} lua_filetype_module

${LUA_LOAD_PACKAGE_MODULE_SOURCE} lua_load_package_module

${LUA_KEYMAP_MODULE_SOURCE} lua_keymap_module

DEPENDS

${CHAR_BLOB_GENERATOR}

${LUA_VIM_MODULE_SOURCE}

@@ -347,6 +349,7 @@ add_custom_command(

${LUA_META_MODULE_SOURCE}

${LUA_FILETYPE_MODULE_SOURCE}

${LUA_LOAD_PACKAGE_MODULE_SOURCE}

${LUA_KEYMAP_MODULE_SOURCE}

VERBATIM

)

@@ -953,23 +953,24 @@ ArrayOf(Dictionary) nvim_buf_get_keymap(uint64_t channel_id, Buffer buffer, Stri

/// @see |nvim_set_keymap()|

///

/// @param buffer Buffer handle, or 0 for current buffer

void nvim_buf_set_keymap(Buffer buffer, String mode, String lhs, String rhs, Dict(keymap) *opts,

Error *err)

void nvim_buf_set_keymap(uint64_t channel_id, Buffer buffer, String mode, String lhs, String rhs,

Dict(keymap) *opts, Error *err)

FUNC_API_SINCE(6)

{

modify_keymap(buffer, false, mode, lhs, rhs, opts, err);

modify_keymap(channel_id, buffer, false, mode, lhs, rhs, opts, err);

}

/// Unmaps a buffer-local |mapping| for the given mode.

///

/// @see |nvim_del_keymap()|

///

/// @param buffer Buffer handle, or 0 for current buffer

void nvim_buf_del_keymap(Buffer buffer, String mode, String lhs, Error *err)

void nvim_buf_del_keymap(uint64_t channel_id, Buffer buffer, String mode,

String lhs, Error *err)

FUNC_API_SINCE(6)

{

String rhs = { .data = "", .size = 0 };

modify_keymap(buffer, true, mode, lhs, rhs, NULL, err);

modify_keymap(channel_id, buffer, true, mode, lhs, rhs, NULL, err);

}

/// Gets a map of buffer-local |user-commands|.

@@ -22,11 +22,11 @@

/// @deprecated

/// @see nvim_exec

String nvim_command_output(String command, Error *err)

String nvim_command_output(uint64_t channel_id, String command, Error *err)

FUNC_API_SINCE(1)

FUNC_API_DEPRECATED_SINCE(7)

{

return nvim_exec(command, true, err);

return nvim_exec(channel_id, command, true, err);

}

/// @deprecated Use nvim_exec_lua() instead.

@@ -585,8 +585,8 @@ Array string_to_array(const String input, bool crlf)

/// @param buffer Buffer handle for a specific buffer, or 0 for the current

/// buffer, or -1 to signify global behavior ("all buffers")

/// @param is_unmap When true, removes the mapping that matches {lhs}.

void modify_keymap(Buffer buffer, bool is_unmap, String mode, String lhs, String rhs,

Dict(keymap) *opts, Error *err)

void modify_keymap(uint64_t channel_id, Buffer buffer, bool is_unmap, String mode, String lhs,

String rhs, Dict(keymap) *opts, Error *err)

{

LuaRef lua_funcref = LUA_NOREF;

bool global = (buffer == -1);

@@ -599,6 +599,8 @@ void modify_keymap(Buffer buffer, bool is_unmap, String mode, String lhs, String

return;

}

const sctx_T save_current_sctx = api_set_sctx(channel_id);

if (opts != NULL && opts->callback.type == kObjectTypeLuaRef) {

lua_funcref = opts->callback.data.luaref;

opts->callback.data.luaref = LUA_NOREF;

@@ -710,6 +712,7 @@ void modify_keymap(Buffer buffer, bool is_unmap, String mode, String lhs, String

parsed_args.rhs_lua = LUA_NOREF; // don't clear ref on success

fail_and_free:

current_sctx = save_current_sctx;

NLUA_CLEAR_REF(parsed_args.rhs_lua);

xfree(parsed_args.rhs);

xfree(parsed_args.orig_rhs);

@@ -1622,3 +1625,20 @@ int find_sid(uint64_t channel_id)

return SID_API_CLIENT;

}

}

/// Sets sctx for API calls.

///

/// @param channel_id api clients id. Used to determine if it's a internal

/// call or a rpc call.

/// @return returns previous value of current_sctx. To be used

/// to be used for restoring sctx to previous state.

sctx_T api_set_sctx(uint64_t channel_id)

{

sctx_T old_current_sctx = current_sctx;

if (channel_id != VIML_INTERNAL_CALL) {

current_sctx.sc_sid =

channel_id == LUA_INTERNAL_CALL ? SID_LUA : SID_API_CLIENT;

current_sctx.sc_lnum = 0;

}

return old_current_sctx;

}

@@ -1586,6 +1586,7 @@ ArrayOf(Dictionary) nvim_get_keymap(uint64_t channel_id, String mode)

/// nmap <nowait> <Space><NL> <Nop>

/// </pre>

///

/// @param channel_id

/// @param mode Mode short-name (map command prefix: "n", "i", "v", "x", …)

/// or "!" for |:map!|, or empty string for |:map|.

/// @param lhs Left-hand-side |{lhs}| of the mapping.

@@ -1597,21 +1598,22 @@ ArrayOf(Dictionary) nvim_get_keymap(uint64_t channel_id, String mode)

/// a Lua function to call when the mapping is executed.

/// Values are Booleans. Unknown key is an error.

/// @param[out] err Error details, if any.

void nvim_set_keymap(String mode, String lhs, String rhs, Dict(keymap) *opts, Error *err)

void nvim_set_keymap(uint64_t channel_id, String mode, String lhs, String rhs, Dict(keymap) *opts,

Error *err)

FUNC_API_SINCE(6)

{

modify_keymap(-1, false, mode, lhs, rhs, opts, err);

modify_keymap(channel_id, -1, false, mode, lhs, rhs, opts, err);

}

/// Unmaps a global |mapping| for the given mode.

///

/// To unmap a buffer-local mapping, use |nvim_buf_del_keymap()|.

///

/// @see |nvim_set_keymap()|

void nvim_del_keymap(String mode, String lhs, Error *err)

void nvim_del_keymap(uint64_t channel_id, String mode, String lhs, Error *err)

FUNC_API_SINCE(6)

{

nvim_buf_del_keymap(-1, mode, lhs, err);

nvim_buf_del_keymap(channel_id, -1, mode, lhs, err);

}

/// Gets a map of global (non-buffer-local) Ex commands.

@@ -37,7 +37,7 @@

/// @param[out] err Error details (Vim error), if any

/// @return Output (non-error, non-shell |:!|) if `output` is true,

/// else empty string.

String nvim_exec(String src, Boolean output, Error *err)

String nvim_exec(uint64_t channel_id, String src, Boolean output, Error *err)

FUNC_API_SINCE(7)

{

const int save_msg_silent = msg_silent;

@@ -52,11 +52,16 @@ String nvim_exec(String src, Boolean output, Error *err)

if (output) {

msg_silent++;

}

const sctx_T save_current_sctx = api_set_sctx(channel_id);

do_source_str(src.data, "nvim_exec()");

if (output) {

capture_ga = save_capture_ga;

msg_silent = save_msg_silent;

}

current_sctx = save_current_sctx;

try_end(err);

if (ERROR_SET(err)) {

@@ -1086,6 +1086,7 @@ int autocmd_register(int64_t id, event_T event, char_u *pat, int patlen, int gro

ac->exec = aucmd_exec_copy(aucmd);

ac->script_ctx = current_sctx;

ac->script_ctx.sc_lnum += sourcing_lnum;

nlua_set_sctx(&ac->script_ctx);

ac->next = NULL;

ac->once = once;

ac->nested = nested;

@@ -256,7 +256,8 @@ static inline void ctx_save_funcs(Context *ctx, bool scriptonly)

size_t cmd_len = sizeof("func! ") + STRLEN(name);

char *cmd = xmalloc(cmd_len);

snprintf(cmd, cmd_len, "func! %s", name);

String func_body = nvim_exec(cstr_as_string(cmd), true, &err);

String func_body = nvim_exec(VIML_INTERNAL_CALL, cstr_as_string(cmd),

true, &err);

xfree(cmd);

if (!ERROR_SET(&err)) {

ADD(ctx->funcs, STRING_OBJ(func_body));