Mercurial > vim
changeset 20259:b69e30dc6e6a v8.2.0685
patch 8.2.0685: Build failure
Commit: https://github.com/vim/vim/commit/3df02f507f96a246366f96dcce156a0ae7b95611
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun May 3 15:47:33 2020 +0200
patch 8.2.0685: Build failure
Problem: Build failure.
Solution: Include missing changes.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sun, 03 May 2020 16:00:04 +0200 |
| parents | ed616e60438d |
| children | fadcfcc96545 |
| files | src/version.c src/vim9compile.c |
| diffstat | 2 files changed, 5 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/src/version.c +++ b/src/version.c @@ -747,6 +747,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 685, +/**/ 684, /**/ 683,
--- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -3905,6 +3905,9 @@ compile_expr1(char_u **arg, cctx_T *cct { char_u *p; + // TODO: Try parsing as a constant. If that works just one PUSH + // instruction needs to be generated. + // evaluate the first expression if (compile_expr2(arg, cctx) == FAIL) return FAIL; @@ -6634,23 +6637,6 @@ delete_def_function_contents(dfunc_T *df delete_instr(dfunc->df_instr + idx); VIM_CLEAR(dfunc->df_instr); } - if (dfunc->df_funcstack != NULL) - { - // Decrease the reference count for the context of a closure. If down - // to zero free it and clear the variables on the stack. - if (--dfunc->df_funcstack->fs_refcount == 0) - { - garray_T *gap = &dfunc->df_funcstack->fs_ga; - typval_T *stack = gap->ga_data; - int i; - - for (i = 0; i < gap->ga_len; ++i) - clear_tv(stack + i); - ga_clear(gap); - vim_free(dfunc->df_funcstack); - } - dfunc->df_funcstack = NULL; - } dfunc->df_deleted = TRUE; }