vim-patch:7.4.2329 (#6341)

Problem:    Error for min() and max() contains %s. (Nikolay Pavlov)
Solution:   Pass the function name. (closes vim/vim#1040)

26b84339fd

src/nvim/eval.c

@@ -13804,8 +13804,9 @@ static void 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;
 }
 

src/nvim/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
+
 func Test_substitute_expr()
   let g:val = 'XXX'
   call assert_equal('XXX', substitute('yyy', 'y*', '\=g:val', ''))

src/nvim/version.c

@@ -112,7 +112,7 @@ static int included_patches[] = {
   // 2332 NA
   2331,
   // 2330,
-  // 2329,
+  2329,
   // 2328,
   // 2327 NA
   2326,