diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2021-06-22 08:50:18 -0400 |
|---|---|---|
| committer | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2021-06-23 23:16:20 -0400 |
| commit | d5329c0331a4e899ea88277b745df8d1bf3a99fa (patch) | |
| tree | 200c2403379bf041d27b7cf2634b8304ed8a1976 /src/nvim/eval.c | |
| parent | 24e0c16fd6cb33a399772330cb80dfa4c1306284 (diff) | |
| download | rneovim-d5329c0331a4e899ea88277b745df8d1bf3a99fa.tar.gz rneovim-d5329c0331a4e899ea88277b745df8d1bf3a99fa.tar.bz2 rneovim-d5329c0331a4e899ea88277b745df8d1bf3a99fa.zip | |
vim-patch:8.1.1437: code to handle callbacks is duplicated
Problem: Code to handle callbacks is duplicated.
Solution: Add callback_T and functions to deal with it.
https://github.com/vim/vim/commit/3a97bb3f0f8bd118ae23f1c97e55d84ff42eef20
Port Vim's put_callback() as callback_put()
because Neovim's naming convention is {type}_{action},
not {action}_{type}.
Renaming put_callback type as PutCallback.
https://neovim.io/develop/style-guide.xml#Type_Names
Diffstat (limited to 'src/nvim/eval.c')
| -rw-r--r-- | src/nvim/eval.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index a3fa9c986f..7e462e568b 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -7324,14 +7324,7 @@ void add_timer_info(typval_T *rettv, timer_T *timer) return; } - if (timer->callback.type == kCallbackPartial) { - di->di_tv.v_type = VAR_PARTIAL; - di->di_tv.vval.v_partial = timer->callback.data.partial; - timer->callback.data.partial->pt_refcount++; - } else if (timer->callback.type == kCallbackFuncref) { - di->di_tv.v_type = VAR_FUNC; - di->di_tv.vval.v_string = vim_strsave(timer->callback.data.funcref); - } + callback_put(&timer->callback, &di->di_tv); } void add_timer_info_all(typval_T *rettv) |