mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-12-04 21:52:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into hide-container-impl

Browse Source
This commit is contained in:
ZyX
2017-12-16 14:27:41 +03:00
parent 76ffe0c5aa 7afd26a6d1
commit 7f3b9a4acc
38 changed files with 457 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/nvim/eval.c
View File

@@ -1099,10 +1099,11 @@ static void restore_vimvar(int idx, typval_T *save_tv)
vimvars[idx].vv_tv = *save_tv;
if (vimvars[idx].vv_type == VAR_UNKNOWN) {
hi = hash_find(&vimvarht, vimvars[idx].vv_di.di_key);
if (HASHITEM_EMPTY(hi))
EMSG2(_(e_intern2), "restore_vimvar()");
else
if (HASHITEM_EMPTY(hi)) {
internal_error("restore_vimvar()");
} else {
hash_remove(&vimvarht, hi);
}
}
}
@@ -1570,7 +1571,7 @@ ex_let_vars (
}
break;
} else if (*arg != ',' && *arg != ']') {
EMSG2(_(e_intern2), "ex_let_vars()");
internal_error("ex_let_vars()");
return FAIL;
}
}
@@ -2969,7 +2970,7 @@ int do_unlet(const char *const name, const size_t name_len, const int forceit)
d = di->di_tv.vval.v_dict;
}
if (d == NULL) {
EMSG2(_(e_intern2), "do_unlet()");
internal_error("do_unlet()");
return FAIL;
}
hashitem_T *hi = hash_find(ht, (const char_u *)varname);
@@ -7985,7 +7986,7 @@ static void f_empty(typval_T *argvars, typval_T *rettv, FunPtr fptr)
break;
}
case VAR_UNKNOWN: {
EMSG2(_(e_intern2), "f_empty(UNKNOWN)");
internal_error("f_empty(UNKNOWN)");
break;
}
}
@@ -17149,7 +17150,7 @@ static void f_type(typval_T *argvars, typval_T *rettv, FunPtr fptr)
break;
}
case VAR_UNKNOWN: {
EMSG2(_(e_intern2), "f_type(UNKNOWN)");
internal_error("f_type(UNKNOWN)");
break;
}
}
@@ -18999,7 +19000,7 @@ static void set_var(const char *name, const size_t name_len, typval_T *const tv,
}
return;
} else if (v->di_tv.v_type != tv->v_type) {
EMSG2(_(e_intern2), "set_var()");
internal_error("set_var()");
}
}
@@ -19266,7 +19267,7 @@ int var_item_copy(const vimconv_T *const conv,
}
break;
case VAR_UNKNOWN:
EMSG2(_(e_intern2), "var_item_copy(UNKNOWN)");
internal_error("var_item_copy(UNKNOWN)");
ret = FAIL;
}
--recurse;
@@ -20954,11 +20955,11 @@ void func_unref(char_u *name)
if (fp == NULL && isdigit(*name)) {
#ifdef EXITFREE
if (!entered_free_all_mem) {
EMSG2(_(e_intern2), "func_unref()");
internal_error("func_unref()");
abort();
}
#else
EMSG2(_(e_intern2), "func_unref()");
internal_error("func_unref()");
abort();
#endif
}
@@ -20997,7 +20998,7 @@ void func_ref(char_u *name)
} else if (isdigit(*name)) {
// Only give an error for a numbered function.
// Fail silently, when named or lambda function isn't found.
EMSG2(_(e_intern2), "func_ref()");
internal_error("func_ref()");
}
}