patch 8.2.0685: Build failure

Problem:    Build failure.
Solution:   Include missing changes.

diff --git a/src/version.c b/src/version.c
index 2bccb328a80f5cf05414e3b2bd6d5e34d2434e48..105df760fb1128a4681f10370f6ebede56fa738a 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -746,6 +746,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    685,
 /**/
     684,
 /**/

diff --git a/src/vim9compile.c b/src/vim9compile.c
index a4a71de1f37ec9d26e0210f9bf8787493ca4c337..c18cdc0a8abf838ef1e4a4cfc4926cbed933dd31 100644 (file)
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -3905,6 +3905,9 @@ compile_expr1(char_u **arg,  cctx_T *cctx)
 {
     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 *dfunc)
            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;
 }