diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2024-12-08 07:35:58 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-08 07:35:58 +0800 |
| commit | 4fcc5cd34a75df9a3088c83dc1a87aa6e37051e1 (patch) | |
| tree | 8cb2e83275826cb83d4ffcd45d062fa7c653cf6a /src | |
| parent | 668d2569b4109e7e83c45578c506c1c64dbd5e87 (diff) | |
| parent | 96329910b011414758380e3c27e32c0ae7f43e1e (diff) | |
| download | rneovim-4fcc5cd34a75df9a3088c83dc1a87aa6e37051e1.tar.gz rneovim-4fcc5cd34a75df9a3088c83dc1a87aa6e37051e1.tar.bz2 rneovim-4fcc5cd34a75df9a3088c83dc1a87aa6e37051e1.zip | |
Merge pull request #31504 from zeertzjq/vim-9.1.0910
vim-patch:9.1.{0910,0911}: 'messagesopt' followup
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/message.c | 7 | ||||
| -rw-r--r-- | src/nvim/option_vars.h | 2 | ||||
| -rw-r--r-- | src/nvim/options.lua | 19 |
3 files changed, 18 insertions, 10 deletions
diff --git a/src/nvim/message.c b/src/nvim/message.c index a32a06edca..d8e6fd3001 100644 --- a/src/nvim/message.c +++ b/src/nvim/message.c @@ -1063,7 +1063,7 @@ int messagesopt_changed(void) int messages_wait_new = 0; int messages_history_new = 0; - char *p = p_meo; + char *p = p_mopt; while (*p != NUL) { if (strnequal(p, S_LEN(MESSAGES_OPT_HIT_ENTER))) { p += STRLEN_LITERAL(MESSAGES_OPT_HIT_ENTER); @@ -1103,6 +1103,11 @@ int messagesopt_changed(void) return FAIL; } + // "wait" must be <= 10000 + if (messages_wait_new > 10000) { + return FAIL; + } + msg_flags = messages_flags_new; msg_wait = messages_wait_new; diff --git a/src/nvim/option_vars.h b/src/nvim/option_vars.h index aca876bddb..97455380cc 100644 --- a/src/nvim/option_vars.h +++ b/src/nvim/option_vars.h @@ -448,7 +448,7 @@ EXTERN OptInt p_mfd; ///< 'maxfuncdepth' EXTERN OptInt p_mmd; ///< 'maxmapdepth' EXTERN OptInt p_mmp; ///< 'maxmempattern' EXTERN OptInt p_mis; ///< 'menuitems' -EXTERN char *p_meo; ///< 'messagesopt' +EXTERN char *p_mopt; ///< 'messagesopt' EXTERN char *p_msm; ///< 'mkspellmem' EXTERN int p_ml; ///< 'modeline' EXTERN int p_mle; ///< 'modelineexpr' diff --git a/src/nvim/options.lua b/src/nvim/options.lua index a5d5a45b59..afce4a918b 100644 --- a/src/nvim/options.lua +++ b/src/nvim/options.lua @@ -5456,21 +5456,24 @@ return { flags = true, deny_duplicates = true, desc = [=[ - Option settings when outputting messages. It can consist of the + Option settings for outputting messages. It can consist of the following items. Items must be separated by a comma. - hit-enter Use |hit-enter| prompt when the message is longer than + hit-enter Use a |hit-enter| prompt when the message is longer than 'cmdheight' size. - wait:{n} Ignored when "hit-enter" is present. Instead of using - |hit-enter| prompt, will simply wait for {n} - milliseconds so the user has a chance to read the - message, use 0 to disable sleep (but then the user may - miss an important message). + wait:{n} Instead of using a |hit-enter| prompt, simply wait for + {n} milliseconds so that the user has a chance to read + the message. The maximum value of {n} is 10000. Use + 0 to disable the wait (but then the user may miss an + important message). + This item is ignored when "hit-enter" is present, but + required when "hit-enter" is not present. history:{n} Determines how many entries are remembered in the |:messages| history. The maximum value is 10000. Setting it to zero clears the message history. + This item must always be present. ]=], expand_cb = 'expand_set_messagesopt', full_name = 'messagesopt', @@ -5478,7 +5481,7 @@ return { scope = { 'global' }, short_desc = N_('options for outputting messages'), type = 'string', - varname = 'p_meo', + varname = 'p_mopt', }, { abbreviation = 'msm', |