patch 7.4.2329
Problem: Error for min() and max() contains %s. (Nikolay Pavlov)
Solution: Pass the function name. (closes #1040)
diff --git a/src/evalfunc.c b/src/evalfunc.c
index 9d94694..1c1dcf7 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -7629,7 +7629,7 @@
}
}
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 3097daf..108ee50 100644
--- a/src/testdir/test_expr.vim
+++ b/src/testdir/test_expr.vim
@@ -335,6 +335,13 @@
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 89e5f95..42eeaa8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2329,
+/**/
2328,
/**/
2327,