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 --- src/nvim/message.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/nvim/message.c') 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; -- 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 --- src/nvim/message.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/nvim/message.c') diff --git a/src/nvim/message.c b/src/nvim/message.c index f6424c4644..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); -- cgit