neovim

commit 6700127b30d55e6ddf70495e7b886464172d7ac6
parent 2b3d1e18545ab9d2853f802c6d5adf54b5bf189c
Author: zeertzjq <zeertzjq@outlook.com>
Date:   Fri, 22 Dec 2023 10:33:34 +0800

vim-patch:9.0.2183: Maximum callback depth is not configurable (#26703)

Problem:  Maximum callback depth is not configurable.
Solution: Revert patch 9.0.2103.  Set 'maxfuncdepth' in test.

fixes: vim/vim#13732
closes: vim/vim#13736

https://github.com/vim/vim/commit/fe583b1e5987fbfdb5f2141c133dbff9665ed301
Diffstat:
M
runtime/doc/message.txt
 | 
2
--
M
runtime/doc/options.txt
 | 
1
+
M
runtime/lua/vim/_meta/options.lua
 | 
1
+
M
src/nvim/eval.c
 | 
4
+---
M
src/nvim/options.lua
 | 
1
+

5 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/runtime/doc/message.txt b/runtime/doc/message.txt
@@ -127,8 +127,6 @@ This happens when an Ex command executes an Ex command that executes an Ex
 command, etc.  The limit is 200 or the value of 'maxfuncdepth', whatever is
 larger.  When it's more there probably is an endless loop.  Probably a
 |:execute| or |:source| command is involved.
-Can also happen with a recursive callback function (|channel-callback|).
-A limit of 20 is used here.
 
 							*E254*  >
   Cannot allocate color {name}
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
@@ -4027,6 +4027,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Increasing this limit above 200 also changes the maximum for Ex
 	command recursion, see |E169|.
 	See also |:function|.
+	Also used for maximum depth of callback functions.
 
 					*'maxmapdepth'* *'mmd'* *E223*
 'maxmapdepth' 'mmd'	number	(default 1000)
diff --git a/runtime/lua/vim/_meta/options.lua b/runtime/lua/vim/_meta/options.lua
@@ -4037,6 +4037,7 @@ vim.go.mat = vim.go.matchtime
 --- Increasing this limit above 200 also changes the maximum for Ex
 --- command recursion, see `E169`.
 --- See also `:function`.
+--- Also used for maximum depth of callback functions.
 ---
 --- @type integer
 vim.o.maxfuncdepth = 100
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
@@ -89,8 +89,6 @@
 
 #define DICT_MAXNEST 100        // maximum nesting of lists and dicts
 
-#define MAX_CALLBACK_DEPTH 20
-
 static const char *e_missbrac = N_("E111: Missing ']'");
 static const char *e_list_end = N_("E697: Missing end of List ']': %s");
 static const char e_cannot_slice_dictionary[]
@@ -6061,7 +6059,7 @@ bool callback_call(Callback *const callback, const int argcount_in, typval_T *co
                    typval_T *const rettv)
   FUNC_ATTR_NONNULL_ALL
 {
-  if (callback_depth > MAX_CALLBACK_DEPTH) {
+  if (callback_depth > p_mfd) {
     emsg(_(e_command_too_recursive));
     return false;
   }
diff --git a/src/nvim/options.lua b/src/nvim/options.lua
@@ -5158,6 +5158,7 @@ return {
         Increasing this limit above 200 also changes the maximum for Ex
         command recursion, see |E169|.
         See also |:function|.
+        Also used for maximum depth of callback functions.
       ]=],
       full_name = 'maxfuncdepth',
       scope = { 'global' },