aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 7.4.1648

Browse Source 
Problem:    Compiler has a problem copying a string into di_key[]. (Yegappan
            Lakshmanan)
Solution:   Add dictitem16_T.
This commit is contained in:
Bram Moolenaar 2016-03-25 15:40:50 +01:00
parent 8b20179c65
commit bee6c0cf86
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/eval.c
View File

@ -292,13 +292,12 @@ typedef struct
#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}
#define VV_NAME(s, t) s, {{t, 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!!! */
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] =
{

9
src/structs.h
View File

@ -1221,6 +1221,15 @@ 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() */

2
src/version.c
View File

@ -748,6 +748,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1648,
/**/
1647,
/**/