Permalink
Browse files

patch 7.4.2329

Problem:    Error for min() and max() contains %s. (Nikolay Pavlov)
Solution:   Pass the function name. (closes #1040)
  • Loading branch information...
1 parent f9e687e commit 26b84339fd8766898bcf6a259cbc2e0c38689726 @brammool brammool committed Sep 4, 2016
Showing with 10 additions and 1 deletion.
  1. +1 −1 src/evalfunc.c
  2. +7 −0 src/testdir/test_expr.vim
  3. +2 −0 src/version.c
View
@@ -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;
}
@@ -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))
View
@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2329,
+/**/
2328,
/**/
2327,

0 comments on commit 26b8433

Please sign in to comment.