Merge pull request #31504 from zeertzjq/vim-9.1.0910

vim-patch:9.1.{0910,0911}: 'messagesopt' followup

3 files changed, 22 insertions, 16 deletions

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 0db7b0f03c..5763d16cad 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -4048,21 +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).
+	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 59d270e640..7a8c3a6c29 100644
--- a/runtime/lua/vim/_meta/options.lua
+++ b/runtime/lua/vim/_meta/options.lua
@@ -4084,21 +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).
+--- 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 <https://github.com/vim/vim>
-" Last Change:	2024 Jul 12
+" Last Change:	2024 Dec 07
 " Former Maintainer:	Bram Moolenaar <Bram@vim.org>
 
 " If there already is an option window, jump to that one.
@@ -626,7 +626,7 @@ call <SID>AddOption("terse", gettext("add 's' flag in 'shortmess' (don't show se
 call <SID>BinOptionG("terse", &terse)
 call <SID>AddOption("shortmess", gettext("list of flags to make messages shorter"))
 call <SID>OptionG("shm", &shm)
-call <SID>AddOption("messagesopt", gettext("Option settings when outputting messages"))
+call <SID>AddOption("messagesopt", gettext("options for outputting messages"))
 call <SID>OptionG("mopt", &mopt)
 call <SID>AddOption("showcmd", gettext("show (partial) command keys in location given by 'showcmdloc'"))
 let &sc = s:old_sc