To: vim_dev@googlegroups.com Subject: Patch 7.4.1648 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 7.4.1648 Problem: Compiler has a problem copying a string into di_key[]. (Yegappan Lakshmanan) Solution: Add dictitem16_T. Files: src/structs.h, src/eval.c *** ../vim-7.4.1647/src/structs.h 2016-03-20 21:17:09.103456337 +0100 --- src/structs.h 2016-03-25 15:25:02.781960409 +0100 *************** *** 1221,1226 **** --- 1221,1235 ---- }; 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() */ *** ../vim-7.4.1647/src/eval.c 2016-03-24 21:41:47.206312503 +0100 --- src/eval.c 2016-03-25 15:39:56.500875444 +0100 *************** *** 292,304 **** #define VV_RO 2 /* read-only */ #define VV_RO_SBX 4 /* read-only in the sandbox */ ! #define VV_NAME(s, t) s, {{t, 0, {0}}, 0, {0}}, {0} static struct vimvar { char *vv_name; /* name of variable, without v: */ ! dictitem_T vv_di; /* value and name for key */ ! char vv_filler[16]; /* space for LONGEST name below!!! */ char vv_flags; /* VV_COMPAT, VV_RO, VV_RO_SBX */ } vimvars[VV_LEN] = { --- 292,303 ---- #define VV_RO 2 /* read-only */ #define VV_RO_SBX 4 /* read-only in the sandbox */ ! #define VV_NAME(s, t) s, {{t, 0, {0}}, 0, {0}} static struct vimvar { char *vv_name; /* name of variable, without v: */ ! dictitem16_T vv_di; /* value and name for key (max 16 chars!) */ char vv_flags; /* VV_COMPAT, VV_RO, VV_RO_SBX */ } vimvars[VV_LEN] = { *** ../vim-7.4.1647/src/version.c 2016-03-25 15:01:06.984578229 +0100 --- src/version.c 2016-03-25 15:25:49.065489973 +0100 *************** *** 750,751 **** --- 750,753 ---- { /* Add new patch number below this line */ + /**/ + 1648, /**/ -- Support your right to bare arms! Wear short sleeves! /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///