318a801
diff -up vim72/src/eval.c.rh514717 vim72/src/eval.c
318a801
--- vim72/src/eval.c.rh514717	2009-08-03 16:15:42.882375154 +0200
318a801
+++ vim72/src/eval.c	2009-08-03 16:34:14.863381780 +0200
318a801
@@ -286,13 +286,12 @@ typedef struct
318a801
 #define VV_RO		2	/* read-only */
318a801
 #define VV_RO_SBX	4	/* read-only in the sandbox */
318a801
 
318a801
-#define VV_NAME(s, t)	s, {{t, 0, {0}}, 0, {0}}, {0}
318a801
+#define VV_NAME(s, t)	s, {{t, 0, {0}}, 0, {0}}
318a801
 
318a801
 static struct vimvar
318a801
 {
318a801
     char	*vv_name;	/* name of variable, without v: */
318a801
     dictitem_T	vv_di;		/* value and name for key */
318a801
-    char	vv_filler[16];	/* space for LONGEST name below!!! */
318a801
     char	vv_flags;	/* VV_COMPAT, VV_RO, VV_RO_SBX */
318a801
 } vimvars[VV_LEN] =
318a801
 {
318a801
diff -up vim72/src/structs.h.rh514717 vim72/src/structs.h
318a801
--- vim72/src/structs.h.rh514717	2009-08-03 16:33:35.274870950 +0200
318a801
+++ vim72/src/structs.h	2009-08-03 16:33:48.607436706 +0200
318a801
@@ -1095,7 +1095,7 @@ struct dictitem_S
318a801
 {
318a801
     typval_T	di_tv;		/* type and value of the variable */
318a801
     char_u	di_flags;	/* flags (only used for variable) */
318a801
-    char_u	di_key[10];	/* key (actually longer!) */
318a801
+    char_u	di_key[18];	/* key */
318a801
 };
318a801
 
318a801
 typedef struct dictitem_S dictitem_T;