updated for version 7.4.166

Problem:    Auto-loading a function for code that won't be executed.
Solution:   Do not auto-load when evaluation is off. (Yasuhiro Matsumoto)

diff --git a/src/eval.c b/src/eval.c
index 3786adfdfb97a093d02441c972fad195ce761b0a..65a947bbd43970f6746299cabb1fc735027ce7c8 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -5159,7 +5159,7 @@ eval7(arg, rettv, evaluate, want_string)
            {
                /* If "s" is the name of a variable of type VAR_FUNC
                 * use its contents. */
-               s = deref_func_name(s, &len, FALSE);
+               s = deref_func_name(s, &len, !evaluate);
 
                /* Invoke the function. */
                ret = get_func_tv(s, len, rettv, arg,

diff --git a/src/version.c b/src/version.c
index 821feb943b913341e5111a8acec7fdd872c3dce6..3e6282a493c94f5d1020ac8f3f5db669d3746e92 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -738,6 +738,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    166,
 /**/
     165,
 /**/