Merge remote-tracking branch 'vim/master'

Author: splhack

src/testdir/test_partial.vim

@@ -260,22 +260,25 @@ func Test_cyclic_dict_arg()
   unlet Pt
 endfunc
 
-func Ignored(job1, job2, status)
+func Ignored3(job1, job2, status)
 endfunc
 
 func Test_cycle_partial_job()
   if has('job')
     let job = job_start('echo')
-    call job_setoptions(job, {'exit_cb': function('Ignored', [job])})
+    call job_setoptions(job, {'exit_cb': function('Ignored3', [job])})
     unlet job
   endif
 endfunc
 
+func Ignored2(job, status)
+endfunc
+
 func Test_ref_job_partial_dict()
   if has('job')
     let g:ref_job = job_start('echo')
     let d = {'a': 'b'}
-    call job_setoptions(g:ref_job, {'exit_cb': function('string', [], d)})
+    call job_setoptions(g:ref_job, {'exit_cb': function('Ignored2', [], d)})
   endif
 endfunc
 

src/userfunc.c

@@ -1099,22 +1099,53 @@ func_free(ufunc_T *fp, int force)
     vim_free(fp);
 }
 
+/*
+ * There are two kinds of function names:
+ * 1. ordinary names, function defined with :function
+ * 2. numbered functions and lambdas
+ * For the first we only count the name stored in func_hashtab as a reference,
+ * using function() does not count as a reference, because the function is
+ * looked up by name.
+ */
+    static int
+func_name_refcount(char_u *name)
+{
+    return isdigit(*name) || *name == '<';
+}
+
 #if defined(EXITFREE) || defined(PROTO)
     void
 free_all_functions(void)
 {
     hashitem_T	*hi;
+    ufunc_T	*fp;
+    long_u	skipped = 0;
+    long_u	todo;
 
     /* Need to start all over every time, because func_free() may change the
      * hash table. */
-    while (func_hashtab.ht_used > 0)
-	for (hi = func_hashtab.ht_array; ; ++hi)
+    while (func_hashtab.ht_used > skipped)
+    {
+	todo = func_hashtab.ht_used;
+	for (hi = func_hashtab.ht_array; todo > 0; ++hi)
 	    if (!HASHITEM_EMPTY(hi))
 	    {
-		func_free(HI2UF(hi), TRUE);
-		break;
+		--todo;
+		/* Only free functions that are not refcounted, those are
+		 * supposed to be freed when no longer referenced. */
+		fp = HI2UF(hi);
+		if (func_name_refcount(fp->uf_name))
+		    ++skipped;
+		else
+		{
+		    func_free(fp, TRUE);
+		    skipped = 0;
+		    break;
+		}
 	    }
-    hash_clear(&func_hashtab);
+    }
+    if (skipped == 0)
+	hash_clear(&func_hashtab);
 }
 #endif
 
@@ -1668,20 +1699,6 @@ trans_function_name(
     return name;
 }
 
-/*
- * There are two kinds of function names:
- * 1. ordinary names, function defined with :function
- * 2. numbered functions and lambdas
- * For the first we only count the name stored in func_hashtab as a reference,
- * using function() does not count as a reference, because the function is
- * looked up by name.
- */
-    static int
-func_name_refcount(char_u *name)
-{
-    return isdigit(*name) || *name == '<';
-}
-
 /*
  * ":function"
  */

src/version.c

@@ -778,6 +778,10 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2198,
+/**/
+    2197,
 /**/
     2196,
 /**/