Merge remote-tracking branch 'upstream/master' into usermarksusermarks

1 files changed, 29 insertions, 22 deletions

diff --git a/src/nvim/eval.lua b/src/nvim/eval.lua
index e4e9b34ec6..c17a44b990 100644
--- a/src/nvim/eval.lua
+++ b/src/nvim/eval.lua
@@ -23,7 +23,7 @@ end
 return {
   funcs={
     abs={args=1, base=1},
-    acos={args=1, base=1, func="float_op_wrapper", data="&acos"},  -- WJMc
+    acos={args=1, base=1, float_func="acos"},  -- WJMc
     add={args=2, base=1},
     ['and']={args=2, base=1},
     api_info={},
@@ -33,12 +33,12 @@ return {
     argidx={},
     arglistid={args={0, 2}},
     argv={args={0, 2}},
-    asin={args=1, base=1, func="float_op_wrapper", data="&asin"},  -- WJMc
+    asin={args=1, base=1, float_func="asin"},  -- WJMc
     assert_beeps={args=1, base=1},
     assert_equal={args={2, 3}, base=2},
     assert_equalfile={args={2, 3}, base=1},
     assert_exception={args={1, 2}},
-    assert_fails={args={1, 3}, base=1},
+    assert_fails={args={1, 5}, base=1},
     assert_false={args={1, 2}, base=1},
     assert_inrange={args={3, 4}, base=3},
     assert_match={args={2, 3}, base=2},
@@ -47,7 +47,7 @@ return {
     assert_notmatch={args={2, 3}, base=2},
     assert_report={args=1, base=1},
     assert_true={args={1, 2}, base=1},
-    atan={args=1, base=1, func="float_op_wrapper", data="&atan"},
+    atan={args=1, base=1, float_func="atan"},
     atan2={args=2, base=1},
     browse={args=4},
     browsedir={args=2},
@@ -67,28 +67,27 @@ return {
     byteidx={args=2, base=1},
     byteidxcomp={args=2, base=1},
     call={args={2, 3}, base=1},
-    ceil={args=1, base=1, func="float_op_wrapper", data="&ceil"},
+    ceil={args=1, base=1, float_func="ceil"},
     changenr={},
     chanclose={args={1, 2}},
     chansend={args=2},
     char2nr={args={1, 2}, base=1},
     charclass={args=1, base=1},
-    charcol={args=1, base=1},
+    charcol={args={1, 2}, base=1},
     charidx={args={2, 3}, base=1},
     chdir={args=1, base=1},
     cindent={args=1, base=1},
     clearmatches={args={0, 1}, base=1},
-    col={args=1, base=1},
+    col={args={1, 2}, base=1},
     complete={args=2, base=2},
     complete_add={args=1, base=1},
     complete_check={},
     complete_info={args={0, 1}, base=1},
     confirm={args={1, 4}, base=1},
     copy={args=1, base=1},
-    cos={args=1, base=1, func="float_op_wrapper", data="&cos"},
-    cosh={args=1, base=1, func="float_op_wrapper", data="&cosh"},
+    cos={args=1, base=1, float_func="cos"},
+    cosh={args=1, base=1, float_func="cosh"},
     count={args={2, 4}, base=1},
-    cscope_connection={args={0, 3}},
     ctxget={args={0, 1}},
     ctxpop={},
     ctxpush={args={0, 1}},
@@ -117,9 +116,9 @@ return {
     execute={args={1, 2}, base=1},
     exepath={args=1, base=1},
     exists={args=1, base=1},
-    exp={args=1, base=1, func="float_op_wrapper", data="&exp"},
+    exp={args=1, base=1, float_func="exp"},
     expand={args={1, 3}, base=1},
-    expandcmd={args=1, base=1},
+    expandcmd={args={1, 2}, base=1},
     extend={args={2, 3}, base=1},
     feedkeys={args={1, 2}, base=1},
     file_readable={args=1, base=1, func='f_filereadable'},  -- obsolete
@@ -130,7 +129,7 @@ return {
     findfile={args={1, 3}, base=1},
     flatten={args={1, 2}, base=1},
     float2nr={args=1, base=1},
-    floor={args=1, base=1, func="float_op_wrapper", data="&floor"},
+    floor={args=1, base=1, float_func="floor"},
     fmod={args=2, base=1},
     fnameescape={args=1, base=1},
     fnamemodify={args=2, base=1},
@@ -147,7 +146,9 @@ return {
     get={args={2, 3}, base=1},
     getbufinfo={args={0, 1}, base=1},
     getbufline={args={2, 3}, base=1},
+    getbufoneline={args=2, base=1},
     getbufvar={args={2, 3}, base=1},
+    getcellwidths={},
     getchangelist={args={0, 1}, base=1},
     getchar={args={0, 1}},
     getcharmod={},
@@ -186,6 +187,7 @@ return {
     gettabvar={args={2, 3}, base=1},
     gettabwinvar={args={3, 4}, base=1},
     gettagstack={args={0, 1}, base=1},
+    gettext={args=1, base=1},
     getwininfo={args={0, 1}, base=1},
     getwinpos={args={0, 1}, base=1},
     getwinposx={},
@@ -236,6 +238,7 @@ return {
     json_decode={args=1, base=1},
     json_encode={args=1, base=1},
     keys={args=1, base=1},
+    keytrans={args=1, base=1},
     last_buffer_nr={},  -- obsolete
     len={args=1, base=1},
     libcall={args=3, base=3},
@@ -245,8 +248,8 @@ return {
     lispindent={args=1, base=1},
     list2str={args={1, 2}, base=1},
     localtime={},
-    log={args=1, base=1, func="float_op_wrapper", data="&log"},
-    log10={args=1, base=1, func="float_op_wrapper", data="&log10"},
+    log={args=1, base=1, float_func="log"},
+    log10={args=1, base=1, float_func="log10"},
     luaeval={args={1, 2}, base=1},
     map={args=2, base=1},
     maparg={args={1, 4}, base=1},
@@ -290,6 +293,7 @@ return {
     perleval={args=1, base=1},
     rand={args={0, 1}, base=1},
     range={args={1, 3}, base=1},
+    readblob={args=1, base=1},
     readdir={args={1, 2}, base=1},
     readfile={args={1, 3}, base=1},
     reduce={args={2, 3}, base=1},
@@ -304,7 +308,7 @@ return {
     ['repeat']={args=2, base=1},
     resolve={args=1, base=1},
     reverse={args=1, base=1},
-    round={args=1, base=1, func="float_op_wrapper", data="&round"},
+    round={args=1, base=1, float_func="round"},
     rpcnotify={args=varargs(2)},
     rpcrequest={args=varargs(2)},
     rpcstart={args={1, 2}},
@@ -332,6 +336,7 @@ return {
     setcharpos={args=2, base=2},
     setcharsearch={args=1, base=1},
     setcmdpos={args=1, base=1},
+    setcmdline={args={1, 2}, base=1},
     setcursorcharpos={args={1, 3}, base=1},
     setenv={args=2, base=2},
     setfperm={args=2, base=1},
@@ -358,8 +363,8 @@ return {
     sign_unplace={args={1, 2}, base=1},
     sign_unplacelist={args=1, base=1},
     simplify={args=1, base=1},
-    sin={args=1, base=1, func="float_op_wrapper", data="&sin"},
-    sinh={args=1, base=1, func="float_op_wrapper", data="&sinh"},
+    sin={args=1, base=1, float_func="sin"},
+    sinh={args=1, base=1, float_func="sinh"},
     sockconnect={args={2,3}},
     sort={args={1, 3}, base=1},
     soundfold={args=1, base=1},
@@ -367,12 +372,13 @@ return {
     spellbadword={args={0, 1}, base=1},
     spellsuggest={args={1, 3}, base=1},
     split={args={1, 3}, base=1},
-    sqrt={args=1, base=1, func="float_op_wrapper", data="&sqrt"},
+    sqrt={args=1, base=1, float_func="sqrt"},
     srand={args={0, 1}, base=1},
     stdpath={args=1},
     str2float={args=1, base=1},
     str2list={args={1, 2}, base=1},
     str2nr={args={1, 3}, base=1},
+    strcharlen={args=1, base=1},
     strcharpart={args={2, 3}, base=1},
     strchars={args={1, 2}, base=1},
     strdisplaywidth={args={1, 2}, base=1},
@@ -402,8 +408,8 @@ return {
     tabpagewinnr={args={1, 2}, base=1},
     tagfiles={},
     taglist={args={1, 2}, base=1},
-    tan={args=1, base=1, func="float_op_wrapper", data="&tan"},
-    tanh={args=1, base=1, func="float_op_wrapper", data="&tanh"},
+    tan={args=1, base=1, float_func="tan"},
+    tanh={args=1, base=1, float_func="tanh"},
     tempname={},
     termopen={args={1, 2}},
     test_garbagecollect_now={},
@@ -417,13 +423,14 @@ return {
     toupper={args=1, base=1},
     tr={args=3, base=1},
     trim={args={1, 3}, base=1},
-    trunc={args=1, base=1, func="float_op_wrapper", data="&trunc"},
+    trunc={args=1, base=1, float_func="trunc"},
     type={args=1, base=1},
     undofile={args=1, base=1},
     undotree={},
     uniq={args={1, 3}, base=1},
     values={args=1, base=1},
     virtcol={args=1, base=1},
+    virtcol2col={args=3, base=1},
     visualmode={args={0, 1}},
     wait={args={2,3}},
     wildmenumode={},