aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-30 04:44:14 -04:00
Code Activity

patch 7.4.2329

Browse Source 
Problem:    Error for min() and max() contains %s. (Nikolay Pavlov)
Solution:   Pass the function name. (closes #1040)
This commit is contained in:
Bram Moolenaar
2016-09-04 21:42:36 +02:00
parent f9e687e068
commit 26b84339fd
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/evalfunc.c
View File

@@ -7629,7 +7629,7 @@ max_min(typval_T *argvars, typval_T *rettv, int domax)
} }
} }
else else
EMSG(_(e_listdictarg)); EMSG2(_(e_listdictarg), domax ? "max()" : "min()");
rettv->vval.v_number = error ? 0 : n; rettv->vval.v_number = error ? 0 : n;
} }

7
src/testdir/test_expr.vim
View File

@@ -335,6 +335,13 @@ function Test_printf_errors()
call assert_fails('echo printf("%d", 1.2)', 'E805:') call assert_fails('echo printf("%d", 1.2)', 'E805:')
endfunc 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() function Test_printf_64bit()
if has('num64') if has('num64')
call assert_equal("123456789012345", printf('%d', 123456789012345)) call assert_equal("123456789012345", printf('%d', 123456789012345))

2
src/version.c
View File

@@ -763,6 +763,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
2329,
/**/ /**/
2328, 2328,
/**/ /**/