diff options
| author | Jakob Schnitzer <mail@jakobschnitzer.de> | 2017-04-24 11:35:10 +0200 |
|---|---|---|
| committer | Jakob Schnitzer <mail@jakobschnitzer.de> | 2017-04-24 11:35:10 +0200 |
| commit | ff8b2eb435c518f0eafd0e509afe1f5ee4a81fd1 (patch) | |
| tree | 526b1df09b06121bdbc6ef5254ef53821958a6cb /src/nvim/eval.lua | |
| parent | 4049492b6d7b8805686b14dbacb3b729abd03308 (diff) | |
| parent | 7f6d3d305269fd1139bc2aec9a91bf98ad595199 (diff) | |
| download | rneovim-ff8b2eb435c518f0eafd0e509afe1f5ee4a81fd1.tar.gz rneovim-ff8b2eb435c518f0eafd0e509afe1f5ee4a81fd1.tar.bz2 rneovim-ff8b2eb435c518f0eafd0e509afe1f5ee4a81fd1.zip | |
Merge branch 'master' into option-fixes
Diffstat (limited to 'src/nvim/eval.lua')
| -rw-r--r-- | src/nvim/eval.lua | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/nvim/eval.lua b/src/nvim/eval.lua index e3c5981b32..21b5bbb139 100644 --- a/src/nvim/eval.lua +++ b/src/nvim/eval.lua @@ -300,14 +300,17 @@ return { tabpagenr={args={0, 1}}, tabpagewinnr={args={1, 2}}, tagfiles={}, - taglist={args=1}, + taglist={args={1, 2}}, tan={args=1, func="float_op_wrapper", data="&tan"}, tanh={args=1, func="float_op_wrapper", data="&tanh"}, tempname={}, termopen={args={1, 2}}, test_garbagecollect_now={}, + timer_info={args={0,1}}, + timer_pause={args=2}, timer_start={args={2,3}}, timer_stop={args=1}, + timer_stopall={args=0}, tolower={args=1}, toupper={args=1}, tr={args=3}, |