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: #16183

Signed-off-by: Shougo Matsushita <Shougo.Matsu@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index a31d0415440e39b8993434fcf9282f808b6f85aa..e2ce17612b5debb2b6e017073f2e248886732b80 100644 (file)
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt*  For Vim version 9.1.  Last change: 2024 Dec 06
+*options.txt*  For Vim version 9.1.  Last change: 2024 Dec 07
 
 
                  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -5649,6 +5649,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/src/message.c b/src/message.c
index 34a2692184341931f548225cb1f05940a75f919e..6b994e5e40f40279ac53a77ec0aaf36951237da0 100644 (file)
--- a/src/message.c
+++ b/src/message.c
@@ -1137,6 +1137,10 @@ messagesopt_changed(void)
     if (messages_history_new > 10000)
         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/testdir/gen_opt_test.vim b/src/testdir/gen_opt_test.vim
index 8bfa57d646dd4289a4d139efbfc2a910701ed78d..74f5ae52c9865cd8c5e3c1b69a42d796476e3e47 100644 (file)
--- a/src/testdir/gen_opt_test.vim
+++ b/src/testdir/gen_opt_test.vim
@@ -236,7 +236,8 @@ let test_values = {
       \                'history:100,wait:100', 'history:0,wait:0',
       \                'hit-enter,history:1,wait:1'],
       \                ['xxx', 'history:500', 'hit-enter,history:-1',
-      \                'hit-enter,history:10001', 'hit-enter']],
+      \                'hit-enter,history:10001', 'history:0,wait:10001',
+      \                'hit-enter']],
       \ 'mkspellmem': [['10000,100,12'], ['', 'xxx', '10000,100']],
       \ 'mouse': [['', 'n', 'v', 'i', 'c', 'h', 'a', 'r', 'nvi'],
       \                ['xxx', 'n,v,i']],

diff --git a/src/version.c b/src/version.c
index e5d1eb1301846bd5334b25b6570af83144dd167b..9c29c4e97b83f2d6c05ec90a7385f50c49029526 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    910,
 /**/
     909,
 /**/