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

Merge pull request #5664 from brcolow/vim-7.4.1707

Browse Source 
vim-patch:7.4.1707
This commit is contained in:
James McCoy
2016-12-01 08:46:18 -05:00
committed by GitHub
parent 1f8a3da796 8f84c1da83
commit 5194e3bc45
4 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/nvim/eval.c
View File

@@ -2160,11 +2160,9 @@ get_lval (
if (lp->ll_tv->v_type == VAR_DICT) {
if (len == -1) {
/* "[key]": get key from "var1" */
key = get_tv_string(&var1); /* is number or string */
if (*key == NUL) {
if (!quiet)
EMSG(_(e_emptykey));
// "[key]": get key from "var1"
key = get_tv_string_chk(&var1); // is number or string
if (key == NULL) {
clear_tv(&var1);
return NULL;
}
@@ -4615,10 +4613,8 @@ eval_index (
dictitem_T *item;
if (len == -1) {
key = get_tv_string(&var1);
if (*key == NUL) {
if (verbose)
EMSG(_(e_emptykey));
key = get_tv_string_chk(&var1);
if (key == NULL) {
clear_tv(&var1);
return FAIL;
}
@@ -6602,10 +6598,8 @@ static int get_dict_tv(char_u **arg, typval_T *rettv, int evaluate)
}
if (evaluate) {
key = get_tv_string_buf_chk(&tvkey, buf);
if (key == NULL || *key == NUL) {
/* "key" is NULL when get_tv_string_buf_chk() gave an errmsg */
if (key != NULL)
EMSG(_(e_emptykey));
if (key == NULL) {
// "key" is NULL when get_tv_string_buf_chk() gave an errmsg
clear_tv(&tvkey);
goto failret;
}