diff options
| author | James McCoy <jamessan@jamessan.com> | 2017-01-08 23:15:03 -0500 |
|---|---|---|
| committer | James McCoy <jamessan@jamessan.com> | 2017-01-10 07:14:24 -0500 |
| commit | 9b47115d538fdddee146f5c6d1e0f2d5504ca8de (patch) | |
| tree | fe5f412d82b7b907ee2d2ab798e35debc22c7cba /src | |
| parent | 6520517e22ad87e1be558f2e899152ca5a9174a2 (diff) | |
| download | rneovim-9b47115d538fdddee146f5c6d1e0f2d5504ca8de.tar.gz rneovim-9b47115d538fdddee146f5c6d1e0f2d5504ca8de.tar.bz2 rneovim-9b47115d538fdddee146f5c6d1e0f2d5504ca8de.zip | |
vim-patch:7.4.2009
Problem: Messages test fails.
Solution: Don't set redir_execute before returning.
https://github.com/vim/vim/commit/ed59aa60d3905f935283727f4a7b33c81a00174b
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/eval.c | 8 | ||||
| -rw-r--r-- | src/nvim/version.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 2e86da5046..17e89e5757 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -8855,10 +8855,6 @@ static void f_execute(typval_T *argvars, typval_T *rettv, FunPtr fptr) return; } - garray_T capture_local; - ga_init(&capture_local, (int)sizeof(char), 80); - capture_ga = &capture_local; - if (argvars[1].v_type != VAR_UNKNOWN) { char_u buf[NUMBUFLEN]; char_u *s = get_tv_string_buf_chk(&argvars[1], buf); @@ -8877,6 +8873,10 @@ static void f_execute(typval_T *argvars, typval_T *rettv, FunPtr fptr) msg_silent++; } + garray_T capture_local; + ga_init(&capture_local, (int)sizeof(char), 80); + capture_ga = &capture_local; + if (argvars[0].v_type != VAR_LIST) { do_cmdline_cmd((char *)get_tv_string(&argvars[0])); } else if (argvars[0].vval.v_list != NULL) { diff --git a/src/nvim/version.c b/src/nvim/version.c index 30371b2d02..b8f0acb96b 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -431,8 +431,8 @@ static int included_patches[] = { 2012, 2011, 2010, - // 2009, - // 2008, + 2009, + 2008, 2007, // 2006, 2005, |