From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 3 May 2020 13:47:33 +0000 (+0200)
Subject: patch 8.2.0685: Build failure
X-Git-Tag: v8.2.0685
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3df02f507f96a246366f96dcce156a0ae7b95611;p=vim

patch 8.2.0685: Build failure

Problem:    Build failure.
Solution:   Include missing changes.
---

diff --git a/src/version.c b/src/version.c
index 2bccb328a..105df760f 100644
--- 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 a4a71de1f..c18cdc0a8 100644
--- 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;
 }