From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 26 Jul 2016 18:46:08 +0000 (+0200)
Subject: patch 7.4.2104
X-Git-Tag: v7.4.2104
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=97baee80f0906ee2f651ee1215ec033e84f866ad;p=vim

patch 7.4.2104
Problem:    Code duplication when unreferencing a function.
Solution:   De-duplicate.
---

diff --git a/src/userfunc.c b/src/userfunc.c
index 32bcceece..30eeb347f 100644
--- a/src/userfunc.c
+++ b/src/userfunc.c
@@ -2640,11 +2640,11 @@ ex_delfunction(exarg_T *eap)
     void
 func_unref(char_u *name)
 {
-    ufunc_T *fp;
+    ufunc_T *fp = NULL;
 
     if (name == NULL)
 	return;
-    else if (isdigit(*name))
+    if (isdigit(*name))
     {
 	fp = find_func(name);
 	if (fp == NULL)
@@ -2654,25 +2654,18 @@ func_unref(char_u *name)
 #endif
 		EMSG2(_(e_intern2), "func_unref()");
 	}
-	else if (--fp->uf_refcount <= 0)
-	{
-	    /* Only delete it when it's not being used.  Otherwise it's done
-	     * when "uf_calls" becomes zero. */
-	    if (fp->uf_calls == 0)
-		func_free(fp);
-	}
     }
     else if (STRNCMP(name, "<lambda>", 8) == 0)
     {
 	/* fail silently, when lambda function isn't found. */
 	fp = find_func(name);
-	if (fp != NULL && --fp->uf_refcount <= 0)
-	{
-	    /* Only delete it when it's not being used.  Otherwise it's done
-	     * when "uf_calls" becomes zero. */
-	    if (fp->uf_calls == 0)
-		func_free(fp);
-	}
+    }
+    if (fp != NULL && --fp->uf_refcount <= 0)
+    {
+	/* Only delete it when it's not being used.  Otherwise it's done
+	 * when "uf_calls" becomes zero. */
+	if (fp->uf_calls == 0)
+	    func_free(fp);
     }
 }
 
diff --git a/src/version.c b/src/version.c
index 8902c9f3a..171aa9cca 100644
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2104,
 /**/
     2103,
 /**/