From f3fa6507f2473d66a4c6172c82dec43bf55f8df6 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Sun, 8 Dec 2024 07:00:17 +0800 Subject: vim-patch:9.1.0910: 'messagesopt' does not check max wait time Problem: 'messagesopt' does not check max wait time (after v9.1.0908) Solution: Check for max wait value (Shougo Matsushita) closes: vim/vim#16183 https://github.com/vim/vim/commit/d9e9f89e0ffd6e7ce5e2a7f8f1ace5471e37c210 Co-authored-by: Shougo Matsushita --- runtime/doc/options.txt | 1 + runtime/lua/vim/_meta/options.lua | 1 + 2 files changed, 2 insertions(+) (limited to 'runtime') diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 0db7b0f03c..7899f40e24 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -4059,6 +4059,7 @@ A jump table for the options with a short description can be found at |Q_op|. 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). + The maximum value is 10000. history:{n} Determines how many entries are remembered in the |:messages| history. The maximum value is 10000. diff --git a/runtime/lua/vim/_meta/options.lua b/runtime/lua/vim/_meta/options.lua index 59d270e640..e38fa4a89f 100644 --- a/runtime/lua/vim/_meta/options.lua +++ b/runtime/lua/vim/_meta/options.lua @@ -4095,6 +4095,7 @@ vim.go.mis = vim.go.menuitems --- 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). +--- The maximum value is 10000. --- --- history:{n} Determines how many entries are remembered in the --- `:messages` history. The maximum value is 10000. -- cgit From 96329910b011414758380e3c27e32c0ae7f43e1e Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Sun, 8 Dec 2024 07:01:59 +0800 Subject: vim-patch:9.1.0911: Variable name for 'messagesopt' doesn't match short name Problem: Variable name for 'messagesopt' doesn't match short name (after v9.1.0908) Solution: Change p_meo to p_mopt. Add more details to docs. closes: vim/vim#16182 https://github.com/vim/vim/commit/8cc43daee1f485c9abf1de3c638cce7835b9f861 --- runtime/doc/options.txt | 18 ++++++++++-------- runtime/lua/vim/_meta/options.lua | 18 ++++++++++-------- runtime/optwin.vim | 4 ++-- 3 files changed, 22 insertions(+), 18 deletions(-) (limited to 'runtime') diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 7899f40e24..5763d16cad 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -4048,22 +4048,24 @@ A jump table for the options with a short description can be found at |Q_op|. *'messagesopt'* *'mopt'* 'messagesopt' 'mopt' string (default "hit-enter,history:500") global - 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). - The maximum value is 10000. + 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. *'mkspellmem'* *'msm'* 'mkspellmem' 'msm' string (default "460000,2000,500") diff --git a/runtime/lua/vim/_meta/options.lua b/runtime/lua/vim/_meta/options.lua index e38fa4a89f..7a8c3a6c29 100644 --- a/runtime/lua/vim/_meta/options.lua +++ b/runtime/lua/vim/_meta/options.lua @@ -4084,22 +4084,24 @@ vim.o.mis = vim.o.menuitems vim.go.menuitems = vim.o.menuitems vim.go.mis = vim.go.menuitems ---- 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). ---- The maximum value is 10000. +--- 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. --- --- @type string vim.o.messagesopt = "hit-enter,history:500" diff --git a/runtime/optwin.vim b/runtime/optwin.vim index 923f55f8fa..6866d46d51 100644 --- a/runtime/optwin.vim +++ b/runtime/optwin.vim @@ -1,7 +1,7 @@ " These commands create the option window. " " Maintainer: The Vim Project -" Last Change: 2024 Jul 12 +" Last Change: 2024 Dec 07 " Former Maintainer: Bram Moolenaar " If there already is an option window, jump to that one. @@ -626,7 +626,7 @@ call AddOption("terse", gettext("add 's' flag in 'shortmess' (don't show se call BinOptionG("terse", &terse) call AddOption("shortmess", gettext("list of flags to make messages shorter")) call OptionG("shm", &shm) -call AddOption("messagesopt", gettext("Option settings when outputting messages")) +call AddOption("messagesopt", gettext("options for outputting messages")) call OptionG("mopt", &mopt) call AddOption("showcmd", gettext("show (partial) command keys in location given by 'showcmdloc'")) let &sc = s:old_sc -- cgit