To: vim_dev@googlegroups.com Subject: Patch 7.4.1579 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 7.4.1579 (after 7.4.1578) Problem: Missing changes in channel.c Solution: Include the changes. Files: src/channel.c *** ../vim-7.4.1578/src/channel.c 2016-03-14 23:22:31.219768924 +0100 --- src/channel.c 2016-03-15 21:43:05.083902085 +0100 *************** *** 1285,1303 **** &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 } /* --- 1285,1291 ---- &rettv, 2, argv, 0L, 0L, &dummy, TRUE, partial, NULL); clear_tv(&rettv); ! redraw_after_callback(); } /* *************** *** 3024,3051 **** 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) { --- 3012,3017 ---- *** ../vim-7.4.1578/src/version.c 2016-03-15 23:10:26.412712095 +0100 --- src/version.c 2016-03-15 23:18:22.447688326 +0100 *************** *** 750,751 **** --- 750,753 ---- { /* Add new patch number below this line */ + /**/ + 1579, /**/ -- hundred-and-one symptoms of being an internet addict: 53. To find out what time it is, you send yourself an e-mail and check the "Date:" field. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///