diff options
author | Justin M. Keyes <justinkz@gmail.com> | 2017-04-16 16:49:14 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-16 16:49:14 +0200 |
commit | 77a4f8f235901778d889aed7c708e1608eac25f6 (patch) | |
tree | bd85c8fc04d7cb4124cb216da90e7960a27b5b0f /src/nvim/eval.lua | |
parent | d4c7f74ed135e1c1069eae265095809f21d9ebd8 (diff) | |
parent | ec0fabd4d5129c7293c8b8fcf0d0946ae5bd5fd4 (diff) | |
download | rneovim-77a4f8f235901778d889aed7c708e1608eac25f6.tar.gz rneovim-77a4f8f235901778d889aed7c708e1608eac25f6.tar.bz2 rneovim-77a4f8f235901778d889aed7c708e1608eac25f6.zip |
Merge #6219 from jbradaric/vim-7.4.2170
vim-patch:7.4.{2170,2180,2240,2241,2242}
Diffstat (limited to 'src/nvim/eval.lua')
-rw-r--r-- | src/nvim/eval.lua | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/nvim/eval.lua b/src/nvim/eval.lua index 6f876e2a96..21b5bbb139 100644 --- a/src/nvim/eval.lua +++ b/src/nvim/eval.lua @@ -306,8 +306,11 @@ return { 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}, |