# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1468957506 -7200
# Node ID 8dced5ab461522ffbfd070a2fa1be8da7d4593de
# Parent  3e42d947b5ada5ba2eed88ca1a011f4f89927191
commit https://github.com/vim/vim/commit/0a0f641b9841189ba4180758109d04d0a26e50e3
Author: Bram Moolenaar <Bram@vim.org>
Date:   Tue Jul 19 21:30:13 2016 +0200

    patch 7.4.2074
    Problem:    One more place using a dummy variable.
    Solution:   Use offsetof(). (Ken Takata)

diff --git a/src/userfunc.c b/src/userfunc.c
--- a/src/userfunc.c
+++ b/src/userfunc.c
@@ -58,9 +58,8 @@ struct ufunc
 #define FC_DICT	    4		/* Dict function, uses "self" */
 
 /* From user function to hashitem and back. */
-static ufunc_T dumuf;
 #define UF2HIKEY(fp) ((fp)->uf_name)
-#define HIKEY2UF(p)  ((ufunc_T *)(p - (dumuf.uf_name - (char_u *)&dumuf)))
+#define HIKEY2UF(p)  ((ufunc_T *)(p - offsetof(ufunc_T, uf_name)))
 #define HI2UF(hi)     HIKEY2UF((hi)->hi_key)
 
 #define FUNCARG(fp, j)	((char_u **)(fp->uf_args.ga_data))[j]
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -759,6 +759,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2074,
+/**/
     2073,
 /**/
     2072,