updated for version 7.1-105

diff --git a/src/eval.c b/src/eval.c
index 69f3af8cee2708a4c3f92baa4bfe828dd92179f7..5d4c720b0903cf129a6c0e3fb2fbb8d6bdecb896 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -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)

diff --git a/src/version.c b/src/version.c
index b43dcc761b279c69293ab41c346b2136f04ed341..90bc0490ddb2a2d5105aec7d54836fa59fbf9e29 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    105,
 /**/
     104,
 /**/