diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-09-04 21:42:36 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-09-04 21:42:36 +0200 |
| commit | 26b84339fd8766898bcf6a259cbc2e0c38689726 (patch) | |
| tree | f273eb017b4f89484ecc35ff8f4f4a346ad23559 /src | |
| parent | f9e687e0681a250e1549ab27b6c7ef2c500395e3 (diff) | |
patch 7.4.2329v7.4.2329
Problem: Error for min() and max() contains %s. (Nikolay Pavlov)
Solution: Pass the function name. (closes #1040)
Diffstat (limited to 'src')
| -rw-r--r-- | src/evalfunc.c | 2 | ||||
| -rw-r--r-- | src/testdir/test_expr.vim | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 10 insertions, 1 deletions
diff --git a/src/evalfunc.c b/src/evalfunc.c index 9d94694d82..1c1dcf7120 100644 --- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -7629,7 +7629,7 @@ max_min(typval_T *argvars, typval_T *rettv, int domax) } } else - EMSG(_(e_listdictarg)); + EMSG2(_(e_listdictarg), domax ? "max()" : "min()"); rettv->vval.v_number = error ? 0 : n; } diff --git a/src/testdir/test_expr.vim b/src/testdir/test_expr.vim index 3097daf443..108ee508ea 100644 --- a/src/testdir/test_expr.vim +++ b/src/testdir/test_expr.vim @@ -335,6 +335,13 @@ function Test_printf_errors() call assert_fails('echo printf("%d", 1.2)', 'E805:') endfunc +function Test_max_min_errors() + call assert_fails('call max(v:true)', 'E712:') + call assert_fails('call max(v:true)', 'max()') + call assert_fails('call min(v:true)', 'E712:') + call assert_fails('call min(v:true)', 'min()') +endfunc + function Test_printf_64bit() if has('num64') call assert_equal("123456789012345", printf('%d', 123456789012345)) diff --git a/src/version.c b/src/version.c index 89e5f9509c..42eeaa84e5 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 */ /**/ + 2329, +/**/ 2328, /**/ 2327, |