patch 8.0.1557: printf() does not work with only one argument

Problem:    printf() does not work with only one argument. (Daniel Hahler)
Solution:   Allow using just the format. (Ken Takata, closes #2687)

diff --git a/src/evalfunc.c b/src/evalfunc.c
index 5b684bd9469928bfff072829dd8c08bfc58a0106..e866f4ce1c6399b591d355d527e9516074c8a859 100644 (file)
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -738,7 +738,7 @@ static struct fst
     {"pow",            2, 2, f_pow},
 #endif
     {"prevnonblank",   1, 1, f_prevnonblank},
-    {"printf",         2, 19, f_printf},
+    {"printf",         1, 19, f_printf},
     {"pumvisible",     0, 0, f_pumvisible},
 #ifdef FEAT_PYTHON3
     {"py3eval",                1, 1, f_py3eval},

diff --git a/src/testdir/test_expr.vim b/src/testdir/test_expr.vim
index c47bc228bc11ab1667c2890f782d82d1b122ce1d..c14b6e671aa5d21c88862a9ec1448bb6e16ca34a 100644 (file)
--- a/src/testdir/test_expr.vim
+++ b/src/testdir/test_expr.vim
@@ -131,6 +131,9 @@ func Test_option_value()
 endfunc
 
 function Test_printf_misc()
+  call assert_equal('123', printf('123'))
+  call assert_fails("call printf('123', 3)", "E767:")
+
   call assert_equal('123', printf('%d', 123))
   call assert_equal('123', printf('%i', 123))
   call assert_equal('123', printf('%D', 123))

diff --git a/src/version.c b/src/version.c
index e1f406a430db5f0aae71264565c48e541d11185a..7d5418592fb877ce327b9fd911cc5098a260a67c 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -778,6 +778,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1557,
 /**/
     1556,
 /**/