thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

updated for version 7.1-105

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

20
src/eval.c
View File

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

2
src/version.c
View File

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