Mercurial > vim
changeset 8579:556817999955 v7.4.1579
commit https://github.com/vim/vim/commit/a3dc5e92dcb79bdc4f0103e6eb91de4c7a6ee9a7
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Mar 15 23:19:14 2016 +0100
patch 7.4.1579
Problem: Missing changes in channel.c
Solution: Include the changes.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Tue, 15 Mar 2016 23:30:06 +0100 |
| parents | 44fc12f442da |
| children | 594b539a8feb |
| files | src/channel.c src/version.c |
| diffstat | 2 files changed, 3 insertions(+), 35 deletions(-) [+] |
line wrap: on
line diff
--- a/src/channel.c +++ b/src/channel.c @@ -1285,19 +1285,7 @@ invoke_callback(channel_T *channel, char &rettv, 2, argv, 0L, 0L, &dummy, TRUE, partial, NULL); clear_tv(&rettv); - /* If an echo command was used the cursor needs to be put back where - * it belongs. If highlighting was changed a redraw is needed. */ - update_screen(0); - setcursor(); - cursor_on(); - out_flush(); -#ifdef FEAT_GUI - if (gui.in_use) - { - gui_update_cursor(TRUE, FALSE); - gui_mch_flush(); - } -#endif + redraw_after_callback(); } /* @@ -3024,28 +3012,6 @@ channel_get_timeout(channel_T *channel, return channel->ch_part[part].ch_timeout; } -/* - * Get a callback from "arg". It can be a Funcref or a function name. - * When "arg" is zero return an empty string. - * Return NULL for an invalid argument. - */ - static char_u * -get_callback(typval_T *arg, partial_T **pp) -{ - if (arg->v_type == VAR_PARTIAL && arg->vval.v_partial != NULL) - { - *pp = arg->vval.v_partial; - return (*pp)->pt_name; - } - *pp = NULL; - if (arg->v_type == VAR_FUNC || arg->v_type == VAR_STRING) - return arg->vval.v_string; - if (arg->v_type == VAR_NUMBER && arg->vval.v_number == 0) - return (char_u *)""; - EMSG(_("E921: Invalid callback argument")); - return NULL; -} - static int handle_mode(typval_T *item, jobopt_T *opt, ch_mode_T *modep, int jo) {