1
0
forked from aniani/vim

updated for version 7.1-105

This commit is contained in:
Bram Moolenaar
2007-09-13 18:40:54 +00:00
parent 61abfd1171
commit 037cc64f8f
2 changed files with 14 additions and 8 deletions

View File

@@ -6746,20 +6746,24 @@ get_dict_tv(arg, rettv, evaluate)
clear_tv(&tvkey);
goto failret;
}
key = get_tv_string_buf_chk(&tvkey, buf);
if (key == NULL || *key == NUL)
if (evaluate)
{
/* "key" is NULL when get_tv_string_buf_chk() gave an errmsg */
if (key != NULL)
EMSG(_(e_emptykey));
clear_tv(&tvkey);
goto failret;
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));
clear_tv(&tvkey);
goto failret;
}
}
*arg = skipwhite(*arg + 1);
if (eval1(arg, &tv, evaluate) == FAIL) /* recursive! */
{
clear_tv(&tvkey);
if (evaluate)
clear_tv(&tvkey);
goto failret;
}
if (evaluate)

View File

@@ -666,6 +666,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
105,
/**/
104,
/**/