aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

patch 8.0.0334: can't access b:changedtick from a dict reference

Browse Source 
Problem:    Can't access b:changedtick from a dict reference.
Solution:   Make changedtick a member of the b: dict. (inspired by neovim
            #6112)
This commit is contained in:
Bram Moolenaar
2017-02-17 16:31:35 +01:00
parent 226c534291
commit 79518e2ace
20 changed files with 200 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/buffer.c
View File

@@ -832,6 +832,7 @@ free_buffer(buf_T *buf)
free_buffer_stuff(buf, TRUE);
#ifdef FEAT_EVAL
unref_var_dict(buf->b_vars);
buf->b_changedtick = &buf->b_ct_val;
#endif
#ifdef FEAT_LUA
lua_buffer_free(buf);
@@ -872,6 +873,29 @@ free_buffer(buf_T *buf)
vim_free(buf);
}
/*
* Initializes buf->b_changedtick.
*/
static void
init_changedtick(buf_T *buf)
{
#ifdef FEAT_EVAL
dictitem_T *di = dictitem_alloc((char_u *)"changedtick");
if (di != NULL)
{
di->di_flags |= DI_FLAGS_LOCK | DI_FLAGS_FIX | DI_FLAGS_RO;
di->di_tv.v_type = VAR_NUMBER;
di->di_tv.v_lock = VAR_FIXED;
di->di_tv.vval.v_number = 0;
dict_add(buf->b_vars, di);
buf->b_changedtick = &di->di_tv.vval.v_number;
}
else
#endif
buf->b_changedtick = &buf->b_ct_val;
}
/*
* Free stuff in the buffer for ":bdel" and when wiping out the buffer.
*/
@@ -889,8 +913,14 @@ free_buffer_stuff(
#endif
}
#ifdef FEAT_EVAL
vars_clear(&buf->b_vars->dv_hashtab); /* free all internal variables */
hash_init(&buf->b_vars->dv_hashtab);
{
varnumber_T tick = *buf->b_changedtick;
vars_clear(&buf->b_vars->dv_hashtab); /* free all buffer variables */
hash_init(&buf->b_vars->dv_hashtab);
init_changedtick(buf);
*buf->b_changedtick = tick;
}
#endif
#ifdef FEAT_USR_CMDS
uc_clear(&buf->b_ucmds); /* clear local user commands */
@@ -1979,6 +2009,7 @@ buflist_new(
}
init_var_dict(buf->b_vars, &buf->b_bufvar, VAR_SCOPE);
#endif
init_changedtick(buf);
}
if (ffname != NULL)