Mercurial > vim
changeset 9456:60efea914fef v7.4.2009
commit https://github.com/vim/vim/commit/ed59aa60d3905f935283727f4a7b33c81a00174b
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Jul 9 17:41:12 2016 +0200
patch 7.4.2009
Problem: Messages test fails.
Solution: Don't set redir_execute before returning.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sat, 09 Jul 2016 17:45:05 +0200 |
| parents | 46bf551d7dbc |
| children | d9de79f79d71 |
| files | src/eval.c src/version.c |
| diffstat | 2 files changed, 11 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/eval.c +++ b/src/eval.c @@ -11445,11 +11445,6 @@ f_execute(typval_T *argvars, typval_T *r return; } - if (redir_execute) - save_ga = redir_execute_ga; - ga_init2(&redir_execute_ga, (int)sizeof(char), 500); - redir_execute = TRUE; - if (argvars[1].v_type != VAR_UNKNOWN) { char_u buf[NUMBUFLEN]; @@ -11468,6 +11463,11 @@ f_execute(typval_T *argvars, typval_T *r else ++msg_silent; + if (redir_execute) + save_ga = redir_execute_ga; + ga_init2(&redir_execute_ga, (int)sizeof(char), 500); + redir_execute = TRUE; + if (cmd != NULL) do_cmdline_cmd(cmd); else @@ -21169,8 +21169,8 @@ f_timer_stop(typval_T *argvars, typval_T if (argvars[0].v_type != VAR_NUMBER) { - EMSG(_(e_number_exp)); - return; + EMSG(_(e_number_exp)); + return; } timer = find_timer((int)get_tv_number(&argvars[0])); if (timer != NULL)