diff options
| -rw-r--r-- | src/userfunc.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/userfunc.c b/src/userfunc.c index 680017ca76..5de5dd00f2 100644 --- a/src/userfunc.c +++ b/src/userfunc.c @@ -4466,7 +4466,7 @@ define_function(exarg_T *eap, char_u *name_arg, garray_T *lines_to_free) int var_conflict = FALSE; v = find_var(name, &ht, TRUE); - if (v != NULL) + if (v != NULL && (in_vim9script() || v->di_tv.v_type == VAR_FUNC)) var_conflict = TRUE; if (SCRIPT_ID_VALID(current_sctx.sc_sid)) diff --git a/src/version.c b/src/version.c index 2dd019443a..f2ce6a42b7 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 4164, +/**/ 4163, /**/ 4162, |