mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-14 23:38:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:7.4.1546

Browse Source 
Problem:    Sticky type checking is more annoying than useful.
Solution:   Remove the error for changing a variable type.

f6f32c38bf

Note: There are a bunch of other changes to eval.txt that I believe are
N/A and not related to this patch.
This commit is contained in:
Patrick
2016-07-13 16:49:22 +10:00
parent dcbd1c7b13
commit a3dc7ef445
5 changed files with 15 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/nvim/eval.c
View File

@@ -18886,19 +18886,6 @@ set_var (
|| tv_check_lock(v->di_tv.v_lock, name, false)) {
return;
}
if (v->di_tv.v_type != tv->v_type
&& !((v->di_tv.v_type == VAR_STRING
|| v->di_tv.v_type == VAR_NUMBER)
&& (tv->v_type == VAR_STRING
|| tv->v_type == VAR_NUMBER))
&& !((v->di_tv.v_type == VAR_NUMBER
|| v->di_tv.v_type == VAR_FLOAT)
&& (tv->v_type == VAR_NUMBER
|| tv->v_type == VAR_FLOAT))
) {
EMSG2(_("E706: Variable type mismatch for: %s"), name);
return;
}
// Handle setting internal v: variables separately where needed to
// prevent changing the type.
@@ -18908,7 +18895,7 @@ set_var (
if (copy || tv->v_type != VAR_STRING)
v->di_tv.vval.v_string = vim_strsave(get_tv_string(tv));
else {
/* Take over the string to avoid an extra alloc/free. */
// Take over the string to avoid an extra alloc/free.
v->di_tv.vval.v_string = tv->vval.v_string;
tv->vval.v_string = NULL;
}