0
0
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00

patch 8.2.0685: Build failure

Problem:    Build failure.
Solution:   Include missing changes.
This commit is contained in:
Bram Moolenaar
2020-05-03 15:47:33 +02:00
parent f7779c63d4
commit 3df02f507f
2 changed files with 5 additions and 17 deletions

View File

@@ -746,6 +746,8 @@ 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 */
/**/
685,
/**/ /**/
684, 684,
/**/ /**/

View File

@@ -3905,6 +3905,9 @@ compile_expr1(char_u **arg, cctx_T *cctx)
{ {
char_u *p; char_u *p;
// TODO: Try parsing as a constant. If that works just one PUSH
// instruction needs to be generated.
// evaluate the first expression // evaluate the first expression
if (compile_expr2(arg, cctx) == FAIL) if (compile_expr2(arg, cctx) == FAIL)
return FAIL; return FAIL;
@@ -6634,23 +6637,6 @@ delete_def_function_contents(dfunc_T *dfunc)
delete_instr(dfunc->df_instr + idx); delete_instr(dfunc->df_instr + idx);
VIM_CLEAR(dfunc->df_instr); 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; dfunc->df_deleted = TRUE;
} }