IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:7.4.2329 (#6341)

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

26b84339fd
This commit is contained in:
Jurica Bradarić 2017-03-23 08:54:01 +01:00 committed by Justin M. Keyes
parent 44e75eba30
commit 06ed7a189b
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/nvim/eval.c
View File

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

7
src/nvim/testdir/test_expr.vim
View File

@ -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', ''))

2
src/nvim/version.c
View File

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