diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/evalfunc.c | 6 | ||||
| -rw-r--r-- | src/testdir/test_expr.vim | 1 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/src/evalfunc.c b/src/evalfunc.c index 16e2365def..53d3d752ec 100644 --- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -3587,8 +3587,7 @@ common_function(typval_T *argvars, typval_T *rettv, int is_funcref) use_string = TRUE; } - if (((use_string && vim_strchr(s, AUTOLOAD_CHAR) == NULL) - || is_funcref)) + if ((use_string && vim_strchr(s, AUTOLOAD_CHAR) == NULL) || is_funcref) { name = s; trans_name = trans_function_name(&name, FALSE, @@ -3597,7 +3596,8 @@ common_function(typval_T *argvars, typval_T *rettv, int is_funcref) s = NULL; } - if (s == NULL || *s == NUL || (use_string && VIM_ISDIGIT(*s))) + if (s == NULL || *s == NUL || (use_string && VIM_ISDIGIT(*s)) + || (is_funcref && trans_name == NULL)) EMSG2(_(e_invarg2), s); /* Don't check an autoload name for existence here. */ else if (trans_name != NULL && (is_funcref diff --git a/src/testdir/test_expr.vim b/src/testdir/test_expr.vim index a7ad65eef4..76811255aa 100644 --- a/src/testdir/test_expr.vim +++ b/src/testdir/test_expr.vim @@ -237,6 +237,7 @@ func Test_funcref() call assert_equal(1, OneByRef()) let OneByRef = funcref('One') call assert_equal(2, OneByRef()) + call assert_fails('echo funcref("{")', 'E475:') endfunc func Test_setmatches() diff --git a/src/version.c b/src/version.c index 02316bfa47..0ab89edd8f 100644 --- a/src/version.c +++ b/src/version.c @@ -764,6 +764,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2233, +/**/ 2232, /**/ 2231, |