diff options
| author | James McCoy <jamessan@jamessan.com> | 2016-06-09 21:18:29 -0400 |
|---|---|---|
| committer | James McCoy <jamessan@jamessan.com> | 2016-06-09 21:18:29 -0400 |
| commit | 56e9e81115f9c551c5820cb49284602224e0e84e (patch) | |
| tree | ab8ac3c159c87735e4015a96eda4c2c896061397 /src | |
| parent | 9e94ffd422ddd763b8b7e5185d8c40904d542e6e (diff) | |
| parent | b1c9d7d2379c91e16fca461f983e2014c720ab8a (diff) | |
| download | rneovim-56e9e81115f9c551c5820cb49284602224e0e84e.tar.gz rneovim-56e9e81115f9c551c5820cb49284602224e0e84e.tar.bz2 rneovim-56e9e81115f9c551c5820cb49284602224e0e84e.zip | |
Merge pull request #4738 from brcolow/vim-7.4.1223
vim-patch:7.4.1223
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/eval.c | 10 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 416a71fe3d..d8c3933ac1 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -508,6 +508,7 @@ void eval_init(void) /* add to compat scope dict */ hash_add(&compat_hashtab, p->vv_di.di_key); } + vimvars[VV_VERSION].vv_nr = VIM_VERSION_100; dict_T *const msgpack_types_dict = dict_alloc(); for (size_t i = 0; i < ARRAY_SIZE(msgpack_type_names); i++) { @@ -17753,7 +17754,8 @@ void set_vim_var_special(const VimVarIndex idx, const SpecialVarValue val) void set_vim_var_string(const VimVarIndex idx, const char *const val, const ptrdiff_t len) { - xfree(vimvars[idx].vv_str); + clear_tv(&vimvars[idx].vv_di.di_tv); + vimvars[idx].vv_type = VAR_STRING; if (val == NULL) { vimvars[idx].vv_str = NULL; } else if (len == -1) { @@ -17769,7 +17771,8 @@ void set_vim_var_string(const VimVarIndex idx, const char *const val, /// @param[in,out] val Value to set to. Reference count will be incremented. void set_vim_var_list(const VimVarIndex idx, list_T *const val) { - list_unref(vimvars[idx].vv_list); + clear_tv(&vimvars[idx].vv_di.di_tv); + vimvars[idx].vv_type = VAR_LIST; vimvars[idx].vv_list = val; if (val != NULL) { val->lv_refcount++; @@ -17783,7 +17786,8 @@ void set_vim_var_list(const VimVarIndex idx, list_T *const val) /// Also keys of the dictionary will be made read-only. void set_vim_var_dict(const VimVarIndex idx, dict_T *const val) { - dict_unref(vimvars[idx].vv_dict); + clear_tv(&vimvars[idx].vv_di.di_tv); + vimvars[idx].vv_type = VAR_DICT; vimvars[idx].vv_dict = val; if (val != NULL) { diff --git a/src/nvim/version.c b/src/nvim/version.c index ea683f0834..917ba8ceb0 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -470,7 +470,7 @@ static int included_patches[] = { // 1226 NA // 1225 NA // 1224 NA - // 1223, + 1223, // 1222 NA // 1221 NA // 1220 NA |