# HG changeset patch # User Christian Brabandt # Date 1468079105 -7200 # Node ID 60efea914fefbf7eac77d170442597bac8bad1ef # Parent 46bf551d7dbc4d970437d9a521c33e6a9698a999 commit https://github.com/vim/vim/commit/ed59aa60d3905f935283727f4a7b33c81a00174b Author: Bram Moolenaar 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. diff --git a/src/eval.c b/src/eval.c --- 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) diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -759,6 +759,10 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2009, +/**/ + 2008, +/**/ 2007, /**/ 2006,