diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/api/ui.c | 2 | ||||
| -rw-r--r-- | src/nvim/api/vim.c | 6 | ||||
| -rw-r--r-- | src/nvim/ex_cmds.c | 7 | ||||
| -rw-r--r-- | src/nvim/ex_docmd.c | 7 | ||||
| -rw-r--r-- | src/nvim/message.c | 3 | ||||
| -rw-r--r-- | src/nvim/misc1.c | 1 | ||||
| -rw-r--r-- | src/nvim/vim.h | 1 |
7 files changed, 15 insertions, 12 deletions
diff --git a/src/nvim/api/ui.c b/src/nvim/api/ui.c index 9f12ae6888..4f28ea5af3 100644 --- a/src/nvim/api/ui.c +++ b/src/nvim/api/ui.c @@ -89,7 +89,7 @@ void remote_ui_wait_for_attach(void) /// @param channel_id /// @param width Requested screen columns /// @param height Requested screen rows -/// @param options |ui-options| map +/// @param options |ui-option| map /// @param[out] err Error details, if any void nvim_ui_attach(uint64_t channel_id, Integer width, Integer height, Dictionary options, Error *err) diff --git a/src/nvim/api/vim.c b/src/nvim/api/vim.c index 9e59eca396..37f2d3c367 100644 --- a/src/nvim/api/vim.c +++ b/src/nvim/api/vim.c @@ -2048,10 +2048,10 @@ Dictionary nvim__stats(void) /// Gets a list of dictionaries representing attached UIs. /// /// @return Array of UI dictionaries, each with these keys: -/// - "height" requested height of the UI -/// - "width" requested width of the UI +/// - "height" Requested height of the UI +/// - "width" Requested width of the UI /// - "rgb" true if the UI uses RGB colors (false implies |cterm-colors|) -/// - "ext_..." Requested UI extensions, see |ui-options| +/// - "ext_..." Requested UI extensions, see |ui-option| /// - "chan" Channel id of remote UI (not present for TUI) Array nvim_list_uis(void) FUNC_API_SINCE(4) diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c index d20b6f5f58..560f4e5df2 100644 --- a/src/nvim/ex_cmds.c +++ b/src/nvim/ex_cmds.c @@ -3692,10 +3692,9 @@ static buf_T *do_sub(exarg_T *eap, proftime_T timeout, i = msg_scroll; msg_scroll = 0; /* truncate msg when needed */ - msg_no_more = TRUE; - /* write message same highlighting as for - * wait_return */ - smsg_attr(HL_ATTR(HLF_R), + msg_no_more = true; + msg_ext_set_kind("confirm_sub"); + smsg_attr(HL_ATTR(HLF_R), // Same highlight as wait_return(). _("replace with %s (y/n/a/q/l/^E/^Y)?"), sub); msg_no_more = FALSE; msg_scroll = i; diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c index 19bf77a2dc..9c4a3f389a 100644 --- a/src/nvim/ex_docmd.c +++ b/src/nvim/ex_docmd.c @@ -839,9 +839,10 @@ int do_cmdline(char_u *cmdline, LineGetter fgetline, sourcing_lnum = current_exception->throw_lnum; current_exception->throw_name = NULL; - discard_current_exception(); /* uses IObuff if 'verbose' */ - suppress_errthrow = TRUE; - force_abort = TRUE; + discard_current_exception(); // uses IObuff if 'verbose' + suppress_errthrow = true; + force_abort = true; + msg_ext_set_kind("emsg"); // kind=emsg for :throw, exceptions. #9993 if (messages != NULL) { do { diff --git a/src/nvim/message.c b/src/nvim/message.c index 4c5f357451..cb83d6482c 100644 --- a/src/nvim/message.c +++ b/src/nvim/message.c @@ -3008,6 +3008,8 @@ void give_warning(char_u *message, bool hl) FUNC_ATTR_NONNULL_ARG(1) } else { keep_msg_attr = 0; } + msg_ext_set_kind("wmsg"); + if (msg_attr((const char *)message, keep_msg_attr) && msg_scrolled == 0) { set_keep_msg(message, keep_msg_attr); } @@ -3348,6 +3350,7 @@ void display_confirm_msg(void) // Avoid that 'q' at the more prompt truncates the message here. confirm_msg_used++; if (confirm_msg != NULL) { + msg_ext_set_kind("confirm"); msg_puts_attr((const char *)confirm_msg, HL_ATTR(HLF_M)); } confirm_msg_used--; diff --git a/src/nvim/misc1.c b/src/nvim/misc1.c index 61fe5e74eb..0008409731 100644 --- a/src/nvim/misc1.c +++ b/src/nvim/misc1.c @@ -2248,6 +2248,7 @@ change_warning ( if (msg_row == Rows - 1) msg_col = col; msg_source(HL_ATTR(HLF_W)); + msg_ext_set_kind("wmsg"); MSG_PUTS_ATTR(_(w_readonly), HL_ATTR(HLF_W) | MSG_HIST); set_vim_var_string(VV_WARNINGMSG, _(w_readonly), -1); msg_clr_eos(); diff --git a/src/nvim/vim.h b/src/nvim/vim.h index 767936ecee..3e0a5907be 100644 --- a/src/nvim/vim.h +++ b/src/nvim/vim.h @@ -277,7 +277,6 @@ enum { FOLD_TEXT_LEN = 51 }; //!< buffer size for get_foldtext() // Enums need a typecast to be used as array index (for Ultrix). #define HL_ATTR(n) highlight_attr[(int)(n)] -#define TERM_STR(n) term_strings[(int)(n)] /// Maximum number of bytes in a multi-byte character. It can be one 32-bit /// character of up to 6 bytes, or one 16-bit character of up to three bytes |