summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/eval.c14
-rw-r--r--src/version.c4
2 files changed, 11 insertions, 7 deletions
diff --git a/src/eval.c b/src/eval.c
index ab808b9e2..3ab8ea495 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -11445,11 +11445,6 @@ f_execute(typval_T *argvars, typval_T *rettv)
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 *rettv)
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 *rettv UNUSED)
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
index 5305beecf..08675cd46 100644
--- 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,