diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2024-12-08 07:00:17 +0800 |
|---|---|---|
| committer | zeertzjq <zeertzjq@outlook.com> | 2024-12-08 07:01:50 +0800 |
| commit | f3fa6507f2473d66a4c6172c82dec43bf55f8df6 (patch) | |
| tree | 861d5a8e8547ce3c955aec0d4223b1986dd4b255 | |
| parent | 668d2569b4109e7e83c45578c506c1c64dbd5e87 (diff) | |
| download | rneovim-f3fa6507f2473d66a4c6172c82dec43bf55f8df6.tar.gz rneovim-f3fa6507f2473d66a4c6172c82dec43bf55f8df6.tar.bz2 rneovim-f3fa6507f2473d66a4c6172c82dec43bf55f8df6.zip | |
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 <Shougo.Matsu@gmail.com>
| -rw-r--r-- | runtime/doc/options.txt | 1 | ||||
| -rw-r--r-- | runtime/lua/vim/_meta/options.lua | 1 | ||||
| -rw-r--r-- | src/nvim/message.c | 5 | ||||
| -rw-r--r-- | src/nvim/options.lua | 1 | ||||
| -rw-r--r-- | test/old/testdir/gen_opt_test.vim | 3 |
5 files changed, 10 insertions, 1 deletions
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. diff --git a/src/nvim/message.c b/src/nvim/message.c index a32a06edca..f6424c4644 100644 --- a/src/nvim/message.c +++ b/src/nvim/message.c @@ -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/options.lua b/src/nvim/options.lua index a5d5a45b59..e08f3d1410 100644 --- a/src/nvim/options.lua +++ b/src/nvim/options.lua @@ -5467,6 +5467,7 @@ return { 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/test/old/testdir/gen_opt_test.vim b/test/old/testdir/gen_opt_test.vim index 74aea93ee9..22ffde5269 100644 --- a/test/old/testdir/gen_opt_test.vim +++ b/test/old/testdir/gen_opt_test.vim @@ -267,7 +267,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']], |