vim-patch:7.4.1648

Problem:    Compiler has a problem copying a string into di_key[]. (Yegappan
            Lakshmanan)
Solution:   Add dictitem16_T.

https://github.com/vim/vim/commit/bee6c0cf86a75faa2aa893f2c9db82fd944a89a5

3 files changed, 13 insertions, 4 deletions

diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 7d7aea83af..045ca22e16 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -292,8 +292,8 @@ typedef enum {
     .vv_di = { \
       .di_tv = { .v_type = type }, \
       .di_flags = 0, \
+      .di_key = { 0 }, \
     }, \
-    .vv_filler = { 0 }, \
     .vv_flags = flags, \
   }
 
@@ -303,8 +303,7 @@ typedef enum {
 // variables with the VV_ defines.
 static struct vimvar {
   char        *vv_name;  ///< Name of the variable, without v:.
-  dictitem_T vv_di;      ///< Value of the variable, with name.
-  char vv_filler[16];    ///< Space for longest name from below.
+  dictitem16_T vv_di;    ///< Value and name for key (max 16 chars)
   char vv_flags;         ///< Flags: #VV_COMPAT, #VV_RO, #VV_RO_SBX.
 } vimvars[] =
 {
diff --git a/src/nvim/eval_defs.h b/src/nvim/eval_defs.h
index 884c987f10..91d544074f 100644
--- a/src/nvim/eval_defs.h
+++ b/src/nvim/eval_defs.h
@@ -114,6 +114,16 @@ struct dictitem_S {
 
 typedef struct dictitem_S dictitem_T;
 
+/// A dictitem with a 16 character key (plus NUL)
+struct dictitem16_S {
+  typval_T di_tv;     ///< type and value of the variable
+  char_u di_flags;    ///< flags (only used for variable)
+  char_u di_key[17];  ///< key
+};
+
+typedef struct dictitem16_S dictitem16_T;
+
+
 #define DI_FLAGS_RO     1   // "di_flags" value: read-only variable
 #define DI_FLAGS_RO_SBX 2   // "di_flags" value: read-only in the sandbox
 #define DI_FLAGS_FIX    4   // "di_flags" value: fixed: no :unlet or remove()
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 3f11c7e860..0f939ad1f4 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -795,7 +795,7 @@ static int included_patches[] = {
   // 1651 NA
   // 1650,
   1649,
-  // 1648,
+  1648,
   // 1647,
   // 1646 NA
   // 1645,