thac0/vim
1
0
Fork 0
forked from aniani/vim
Code

patch 7.4.2009

Browse Source 
Problem:    Messages test fails.
Solution:   Don't set redir_execute before returning.
This commit is contained in:
Bram Moolenaar 2016-07-09 17:41:12 +02:00
parent 79815f1ec7
commit ed59aa60d3
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/eval.c
View File

@ -11445,11 +11445,6 @@ f_execute(typval_T *argvars, typval_T *rettv)
return; 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) if (argvars[1].v_type != VAR_UNKNOWN)
{ {
char_u buf[NUMBUFLEN]; char_u buf[NUMBUFLEN];
@ -11468,6 +11463,11 @@ f_execute(typval_T *argvars, typval_T *rettv)
else else
++msg_silent; ++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) if (cmd != NULL)
do_cmdline_cmd(cmd); do_cmdline_cmd(cmd);
else else
@ -21169,8 +21169,8 @@ f_timer_stop(typval_T *argvars, typval_T *rettv UNUSED)
if (argvars[0].v_type != VAR_NUMBER) if (argvars[0].v_type != VAR_NUMBER)
{ {
EMSG(_(e_number_exp)); EMSG(_(e_number_exp));
return; return;
} }
timer = find_timer((int)get_tv_number(&argvars[0])); timer = find_timer((int)get_tv_number(&argvars[0]));
if (timer != NULL) if (timer != NULL)

4
src/version.c
View File

@ -758,6 +758,10 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
2009,
/**/
2008,
/**/ /**/
2007, 2007,
/**/ /**/